DistRen Changeset - d6d0d0d26d0b · protofusion repositories

Changeset - d6d0d0d26d0b

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Nathan Brink (binki) - 16 years ago 2009-11-27 13:00:57
ohnobinki@ohnopublishing.net

nuke global vars, order and fix #include-s

5 files changed with 25 insertions and 28 deletions:

src/server/distrend.c

src/server/distrenjob.c

src/server/slave.c

src/server/slavefuncs.c

src/server/user_mgr.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* This file contains the code which both processes (renders) jobs as a slave, and the code which distributes frames to slaves after receiving them from the client portion of the codebase. */
 #include "asprintf.h"
 #include "distrenjob.h"
 #include "execio.h"
 #include "listen.h"
 #include "options.h"
 #include "distrenjob.h"
 #include "listen.h"
 #include "protocol.h"
 #include "slavefuncs.h"
 #include "asprintf.h"
 #include <confuse.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <string.h>
 #include <unistd.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlreader.h>
 /* ******************* Structs ************************ */
 struct general_info {
   short int jobs_in_queue; //
   unsigned short int free_clients;
   unsigned short int rendering_clients;//
   unsigned short int total_finished_jobs; //
   unsigned int total_frames_rendered; //
   unsigned int highest_jobnum;
   short int hibernate;
   unsigned int timestamp;
   unsigned long int total_render_power;
   unsigned long int total_priority_pieces;
 } general_info;
 /*
   internally defined funcs's prototypes @TODO: Make all functions nice and proper */
   internally defined funcs's prototypes @TODO: Make all functions nice and proper
 */
 void distrenjob_remove(struct distrenjob *head, struct distrenjob *bj);
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum);
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job);
 void mortition(struct distrenjob *head, struct distrenjob *job);
 int makeJobDataXML(struct distrenjob *job);
 int updateJobListXML(struct distrenjob *head);
 int createQueueFromXML(struct distrenjob *head);
 int reCreateQueueFromXML(struct distrenjob *head, xmlDocPtr doc, xmlNodePtr current);
 void updateGeneralInfo();
 void importGeneralInfo();
 int updateJobStatsXML(struct distrenjob *job);
 /* Global Vars, eliminate these */
 jobnum_t jobnum = 0; // The next job number to create in the queue
 int hcfjob; // Highest consecutively finished job
 int highest_jobnum; // The job number of the most recently created job, this is used when creating new jobs
 /* ********************** 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! */
 int xml_dump()
+{
   return 0;
+}
 /**
    Performs command stored in a client's request.
 */
 int distrend_do()
+{
   return 0;
+}
 /**
    Accepts a client's connection
  */
 void distrend_accept()
+{
+}
 /**
    Frees the action
 */
 void distrend_action_free()
+{
+}
 /** Fill variables after crash / shutdown from XML dumps */
 int start_data(struct distrenjob *head, char *datadir)
+{
   struct stat buffer;
   if(stat("general_info.xml", &buffer) == 0){
     importGeneralInfo();
     fprintf(stderr,"Parsing XML files and restoring previous state...\n");
     createQueueFromXML(head);
     return 1;
+  }
   else{
     fprintf(stderr,"Couldn't find XML dump, starting up fresh.\n");
     general_info.total_finished_jobs = 0;
     general_info.total_frames_rendered = 0;
     general_info.free_clients = 0;
     general_info.highest_jobnum = 0;
     general_info.jobs_in_queue = 0;
     general_info.rendering_clients = 0;
     general_info.hibernate = 0;
     general_info.timestamp = 0;
     // Create the stor directory
     // char *stor;
     // _distren_asprintf(&stor, "%s/stor", datadir);
     // mkdir(stor);
     return 2;
+  }
+}
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 void finish_frame(struct distrenjob *head, struct distrenjob *distrenjob, int frame)
+{
   distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
-  distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob[jobnum].frameset[frame].start_time);
+  distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob->frameset[frame].start_time);
   distrenjob->completed_frames++;
   distrenjob->assigned_frames--;
   general_info.total_frames_rendered++; // Increase total frames var for stats
   updateGeneralInfo();
   updateJobStatsXML(distrenjob);
+}
 /** "mortition" check to see if a job is actually done by scanning the folder of the job to make sure all frames are present*/
 void mortition(struct distrenjob *head, struct distrenjob *job)
+{
   short int isJobDone;
   int counter;
   char *path_and_number;
   struct stat buffer;
   isJobDone = 1; // set isJobDone to true
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       _distren_asprintf(&path_and_number, "stor/job%d/out/%d.%s", job->jobnum, job->frameset[counter].num, job->output_format);
       if(stat(path_and_number, &buffer) == -1)
+        {
           job->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
           job->completed_frames--;
           general_info.total_frames_rendered--;
           isJobDone = 0; // if a missing frame is found, set isJobDone to false
+        }
+    }
   if(isJobDone) // if all frames were accounted for
+    {
       distrenjob_remove(head, job);
       distrenjob_free(&job);
       general_info.jobs_in_queue--;
       updateJobListXML(head);
+    }
   else{
     job->prev_frame_index = -1; // if the job isn't done, have frame_finder() start from the first frame, allowing it to see the frames that are now unassigned
+  }
   updateGeneralInfo();
+}
 /** scans the frames of a job to initialize a job after server */
 /* returns 1 if the job is completely done and there are no missing frames */
 /* returns 0 if a missing frame is found */
 int restoreJobState(struct distrenjob *job)
+{
   short int isJobDone;
   int counter;
   char *path_and_number;
   struct stat buffer;
   isJobDone = 1;
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       _distren_asprintf(&path_and_number, "stor/job%d/out/%d.%s", job->jobnum, job->frameset[counter].num, job->output_format);
       if(stat(path_and_number, &buffer) == 0)
+        {
           job->frameset[counter].status = FRAMESETSTATUS_ASSIGNED;
           job->completed_frames++;
+        }
       else
         isJobDone = 0;
+    }
   return isJobDone;
+}
 /** creates a structure from starting data, then calls another function to actually add that struct to the queue */
 int prepare_distrenjob(struct distrenjob *head, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
+{
   int counter2;
   int counter;
   int tmp;
   char *path_with_num;
   struct distrenjob *distrenjob;
   tmp = distrenjob_new(&distrenjob);
   if(tmp)
     return 1;
   general_info.highest_jobnum++;
   distrenjob->jobnum = general_info.highest_jobnum;
   distrenjob->type = 1;
   distrenjob->name = name;
   distrenjob->submitter = submitter;
   distrenjob->email = email;
   distrenjob->priority = priority;
   distrenjob->width = width;
   distrenjob->height = height;
   distrenjob->total_frames = (end_frame - start_frame + 1); /* sets the total number of frames in animation for status purposes */
   distrenjob->frameset = malloc(sizeof(struct frameset) * distrenjob->total_frames);
   if(!distrenjob->frameset)
+    {
       distrenjob_free(&distrenjob);
       return 1;
+    }
   /* prepares all the frames by setting that status to "unassigned" */
   counter2 = start_frame;
   for(counter = 0; counter < distrenjob->total_frames; counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
     counter2++;
+  }
   _distren_asprintf(&path_with_num, "stor/job%d/out/", distrenjob->jobnum);
   fprintf(stderr, "creating dir '%s'", path_with_num);
   /* add job to queue */
   fprintf(stderr, "\nprepare_distrenjob: attempting makeJobDataXML()\n");
   makeJobDataXML(distrenjob);
   fprintf(stderr, "\nprepare_distrenjob: attempting distrenjob_enqueue()\n");
   distrenjob_enqueue(head, distrenjob);
   general_info.jobs_in_queue++;
   fprintf(stderr, "\nprepare_distrenjob: attempting updateJobListXML()\n");
   updateJobListXML(head);
   fprintf(stderr, "\nprepare_distrenjob: attempting updateGeneralInfo()\n");
   updateGeneralInfo();
   fprintf(stderr, "\nprepare_distrenjob: attempting updateJobStatsXML()\n");
   updateJobStatsXML(distrenjob);
   return 0;
+}
 /** distrenjob_enqueue: This function adds the job to the queue based on its priority */
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job)
+{
   struct distrenjob *prev_job = head; // create pointer to previous job
   struct distrenjob *current_job;     // create pointer to current_job (which job is being compared to)
   // iterate through linked list of jobs
   for(current_job = head->next; 1; current_job = current_job->next)
+  {
 	fprintf(stderr, "enqueue loop iteration\n");
     if(current_job == NULL){ // if it has reached the end of the list, add job there
       prev_job->next = job;
       fprintf(stderr, "adding job at end of queue\n");
       break;
+    }
     else if(job->priority < current_job->priority){ // if job's priority is less than current_job's priority, insert job
       prev_job->next = job;                        // keep in mind 1 is the highest priority given to jobs, head has a
       job->next = current_job;                     // priority of zero so it will always be before other jobs
       fprintf(stderr, "adding job before jobname: %s\n", current_job->name);
       break;
+    }
     prev_job = current_job;
   } /* for(current_job) */
+}
 /** Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head */
 void change_job_priority(struct distrenjob *head, struct distrenjob *job, int new_priority){
   distrenjob_remove(head, job);
   job->priority = new_priority;
   struct distrenjob *current_job;
   struct distrenjob *prev_job = head;
   if(job->frameset[0].status == FRAMESETSTATUS_UNASSIGNED)
     /* if job was not yet started */
     distrenjob_enqueue(head, job);
   else{ // if job has already been started, place it before the jobs with the same priority
     // iterate through linked list of jobs
     for(current_job = head; current_job != NULL; current_job = current_job->next){
       if(current_job == NULL){ // if it has reached the end of the list, add job there
         prev_job->next = job;
         break;
+      }
       else if(job->priority <= current_job->priority){ // if job's priority is less than or equal to current_job's priority, insert job
         prev_job->next = job;                        // keep in mind 1 is the highest priority given to jobs, head has a
         job->next = current_job;                     // priority of zero so it will always be before other jobs
         break;
+      }
       prev_job = current_job;
+    }
+  }
   updateJobListXML(head);
   makeJobDataXML(job); // because priority is changed
+}
 /**
   Frame Finder: matches your computer up with a lovely frame to render, starts looking at oldest job first
   @TODO: We must return both jobnum and framenum
   @TODO: Add calls in main()
   @return 0 success, other: error
 */
 int find_jobframe(struct distrenjob *head, struct distrenjob **job, struct frameset **frame)
+{
   if(general_info.hibernate)
     return 1;
   unsigned int frame_counter;
   unsigned short int found;
   struct distrenjob *distrenjob_ptr;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next; distrenjob_ptr && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
+  {
     for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
+    {
       if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
+      {
     	found = 1;
     	distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
     	distrenjob_ptr->frameset[frame_counter].start_time = clock();
     	distrenjob_ptr->assigned_frames++;
     	distrenjob_ptr->prev_frame_index = frame_counter;
     	updateJobStatsXML(distrenjob_ptr);
+      }
       if(found)
     	break;
+    }
     if(found)
       break;
+  }
   if(!found)
+    {
       fprintf(stderr, "No more jobs to render\n");
       sleep(1); /*< @todo eliminate the need for this line*/
       return 1;
+    }
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
   return 0;
+}
 int find_jobframe_from_job(struct distrenjob *distrenjob_ptr, struct distrenjob **job, struct frameset **frame)
+{
   unsigned int frame_counter;
   unsigned short int found;
   found = 0;
   for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
+  {
     if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
+      {
     	found = 1;
 		distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
 		distrenjob_ptr->frameset[frame_counter].start_time = clock();
 		distrenjob_ptr->assigned_frames++;
 		distrenjob_ptr->prev_frame_index = frame_counter;
 		updateJobStatsXML(distrenjob_ptr);
+      }
     if(found)
       break;
+  }
   if(!found)
+    {
       fprintf(stderr, "No more frames in this job number %d", distrenjob_ptr->jobnum);
       distrenjob_ptr->prev_frame_index = frame_counter;
       return 1;
+    }
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
   return 0;
+}
 // find a frame to render when the job that the last frame was for no longer exists
 int find_jobframe_new(struct distrenjob *head, int rend_pwr, struct distrenjob **job, struct frameset **frame)
+{
   if(general_info.hibernate)
     return 1;
   float power_difference;
   float greatest_power_difference;
   unsigned short int found;
   struct distrenjob *job_to_render;
   struct distrenjob *distrenjob_ptr;
   greatest_power_difference = -10000;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next;
   distrenjob_ptr && !distrenjob_ptr->hibernate;
   distrenjob_ptr = distrenjob_ptr->next)
+  {
 	  if(distrenjob_ptr->prev_frame_index < (distrenjob_ptr->total_frames - 1))
+	  {
 		  power_difference = (((float)general_info.total_render_power / (float)general_info.total_priority_pieces)*(11-(float)distrenjob_ptr->priority));
 		  power_difference = power_difference - (float)distrenjob_ptr->assigned_render_power;
 		  fprintf(stderr, "job num %d\npower difference: %f\n", distrenjob_ptr->jobnum, power_difference);
 		  if(power_difference > greatest_power_difference)
+		  {
 			  job_to_render = distrenjob_ptr;
 			  greatest_power_difference = power_difference;
 			  found = 1;
+		  }
+	  }
+  }
   if(!found)
+    {
       fprintf(stderr, "No more jobs to render\n");
       return 1;
+    }
   find_jobframe_from_job(job_to_render, job, frame);
   job_to_render->assigned_render_power = job_to_render->assigned_render_power + rend_pwr;
   return 0;
+}
 // gets a frame to render from the same job that the previously rendered frame was from
 int find_jobframe_again(struct distrenjob *head, int jobnum, int rend_pwr, struct distrenjob **job, struct frameset **frame)
+{
   if(general_info.hibernate)
     return 1;
   short int found;
   struct distrenjob *distrenjob_ptr;
   distrenjob_ptr = distrenjob_get(head, jobnum);
   // if the job was not found or there are no frames left in the job...
   if(!distrenjob_ptr || distrenjob_ptr->prev_frame_index >= (distrenjob_ptr->total_frames - 1))
+    {
       fprintf(stderr, "Job number %d has been finished, finding new job\n", jobnum);
       // if previous job isn't yet finished the render power of the slave is removed from it
       if(distrenjob_ptr)
     	  distrenjob_ptr->assigned_render_power = distrenjob_ptr->assigned_render_power - rend_pwr;
       return find_jobframe_new(head, rend_pwr, job, frame);
+    }
   found = 0;
   found = find_jobframe_from_job(distrenjob_ptr, job, frame);
   if(found)
 	  find_jobframe_new(head, rend_pwr, job, frame);
   return 0;
+}
 /** Checks for dead, latent, or stale slaves */
 void frame_watchdog(struct distrenjob *distrenjob_head)
+{
   struct distrenjob *distrenjob_ptr;
   unsigned int counter;
   for(distrenjob_ptr = distrenjob_head->next; distrenjob_ptr; distrenjob_ptr = distrenjob_ptr->next)
   /* iterate through jobs */
+  {
     /* if the job has been started, checks by seeing if either to first or second frame has been started */
     if(distrenjob_ptr->frameset[0].status != FRAMESETSTATUS_UNASSIGNED || distrenjob_ptr->frameset[1].status != FRAMESETSTATUS_UNASSIGNED)
       /* iterate through all frames for this job: */
       for(counter = 0; counter < distrenjob_ptr->total_frames; counter ++)
 	    /*watchdog_forgiveness = seconds of forgiveness before frame is re-assigned: */
         if((distrenjob_ptr->frameset[counter].start_time + distrenjob_ptr->watchdog_forgiveness) < clock())
+        {
             /*
             If frame is not completed within the number of seconds specified by watchdog_forgiveness
             Then change the frame status to unassigned
             */
             distrenjob_ptr->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
             distrenjob_ptr->assigned_frames--;
+        }
     updateJobStatsXML(distrenjob_ptr);
+  }
+}
 /**
    Finds a distrenjob struct based on the jobnum
    @arg jobnum job number to search for
    @return NULL on job doesn't exist
  */
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum)
+{
   struct distrenjob *distrenjob_ptr;
   /*
     The conditions of the for loop will leave distrenjob_ptr at NULL if the end of the list is reached. It will leave it pointing to the correct job if it is found.
    */
   for(distrenjob_ptr = head;
       distrenjob_ptr
         && distrenjob_ptr->jobnum != jobnum;
       distrenjob_ptr = distrenjob_ptr->next);
   return distrenjob_ptr;
+}
 /**
    Removes a distrenjob from the distrenjob linked list. It does not free the distrenjob, however. You should do that with distrenjob_free() from distrenjob.h
    @arg head pointer to the head of the linkedlist of distrenjobs
  */
 void distrenjob_remove(struct distrenjob *head, struct distrenjob *bj)
+{
   struct distrenjob *previous_distrenjob;
   for(previous_distrenjob = head;
       previous_distrenjob
 	&& previous_distrenjob->next != bj; /*< stop on the distrenjob that comes before bj */
       previous_distrenjob = previous_distrenjob->next)
     /* all of the action is in the definition of the for loop itself */;
   /*
     This removes references to bj from the linked list. I.E., we now skip bj when iterating through the list
   */
   previous_distrenjob->next = bj->next;
   general_info.jobs_in_queue--;
+}
 /* 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;
   /*
    * 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);
   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);
   xmlTextWriterWriteElement(writer, (xmlChar*)"jobs_in_queue", (xmlChar*)tmp);
   _distren_asprintf(&tmp, "%d", general_info.total_finished_jobs);
   xmlTextWriterWriteElement(writer, (xmlChar*)"total_finished_jobs", (xmlChar*)tmp);
   _distren_asprintf(&tmp, "%d", general_info.total_frames_rendered);
   xmlTextWriterWriteElement(writer, (xmlChar*)"total_frames_rendered", (xmlChar*)tmp);
   _distren_asprintf(&tmp, "%d", general_info.highest_jobnum);
   xmlTextWriterWriteElement(writer, (xmlChar*)"highest_jobnum", (xmlChar*)tmp);
   xmlTextWriterEndDocument(writer);
   xmlFreeTextWriter(writer);
+}
 // this reads the information from general_info.xml to the general_info structure
 void importGeneralInfo()
+{
   xmlDocPtr doc;
   xmlNodePtr cur;
   doc = xmlParseFile("general_info.xml");
   cur = xmlDocGetRootElement(doc);
   if (xmlStrcmp(cur->name, (xmlChar*)"general_info"))
+    {
       fprintf(stderr, "xml document is wrong type");
       xmlFreeDoc(doc);
       return;
+    }
   cur = cur->xmlChildrenNode;
   general_info.jobs_in_queue = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   cur = cur->next;
   general_info.total_finished_jobs = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   cur = cur->next;
   general_info.total_frames_rendered = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   cur = cur->next;
   general_info.highest_jobnum = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   general_info.hibernate = 0;
   general_info.free_clients = 0;
   general_info.rendering_clients = 0;
   general_info.timestamp = 0;
   general_info.total_render_power = 0;
   general_info.total_priority_pieces = 0;
   xmlFreeDoc(doc);
+}
 // returns 1 on successful completion of xml file
 // creates the xml file that slaves read from, and is used to restart distren
 int makeJobDataXML(struct distrenjob *job)
+{
   xmlTextWriterPtr writer;
   char *tmp; // temporarily holds strings to be given to the xml writer
   _distren_asprintf(&tmp, "stor/job%d/job_info.xml", job->jobnum);
   // create xml document at the location tmp with no compression
   writer = xmlNewTextWriterFilename(tmp, 0);
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   // write distrenjob element and add its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"job");
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"name", (xmlChar*)job->name);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"submitter", (xmlChar*)job->submitter);
   _distren_asprintf(&tmp, "%d", job->priority);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"priority", (xmlChar*)tmp);
   // write resolution element and add its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"resolution");
   _distren_asprintf(&tmp, "%d", job->width);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"width", (xmlChar*)tmp);
   _distren_asprintf(&tmp, "%d", job->height);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"height", (xmlChar*)tmp);
   xmlTextWriterEndElement(writer);
   // write video element and its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"video");
   _distren_asprintf(&tmp, "%d", job->frameset[0].num);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"start_frame", (xmlChar*)tmp);
   _distren_asprintf(&tmp, "%d", job->frameset[(job->total_frames - 1)].num);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"end_fame", (xmlChar*)tmp);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"output_format", (xmlChar*)job->output_format);
   xmlTextWriterEndElement(writer);
   // write watchdog forgiveness element
   _distren_asprintf(&tmp, "%d", job->watchdog_forgiveness);
   xmlTextWriterWriteElement(writer, (xmlChar*)"wd_forgiveness", (xmlChar*)tmp);
   // end document
   xmlTextWriterEndDocument(writer);
   // free writer and save xml file to disk
   xmlFreeTextWriter(writer);
   return 1;
+}
 // extracts data from the xml created by above function and creates a job from it
 // it returns a pointer to the created job
 struct distrenjob *createJobFromXML(int job_number)
+{
   xmlDocPtr doc;
   xmlNodePtr cur;
   char *file_name;
   struct distrenjob *distrenjob;
   int start_frame;
   int counter;
   int counter2;
   distrenjob_new(&distrenjob);
   _distren_asprintf(&file_name, "stor/job%d/job_info.xml", job_number);
   doc = xmlParseFile(file_name);
   cur = xmlDocGetRootElement(doc);
   distrenjob->name = (char*)xmlGetProp(cur, (xmlChar*)"name");
   distrenjob->submitter = (char*)xmlGetProp(cur, (xmlChar*)"submitter");
   distrenjob->priority = atoi((char*)xmlGetProp(cur, (xmlChar*)"priority"));
   cur = cur->xmlChildrenNode;
   distrenjob->width = atoi((char*)xmlGetProp(cur, (xmlChar*)"width"));
   distrenjob->height = atoi((char*)xmlGetProp(cur, (xmlChar*)"number"));
   cur = cur->next;
   start_frame = atoi((char*)xmlGetProp(cur, (xmlChar*)"start_frame"));
   distrenjob->total_frames = atoi((char*)xmlGetProp(cur, (xmlChar*)"end_frame")) - start_frame + 1;
   distrenjob->output_format = (char*)xmlGetProp(cur, (xmlChar*)"output_format");
   cur = cur->next;
   distrenjob->watchdog_forgiveness = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   xmlFreeDoc(doc);
   // load up stats.xml file to retrieve data
   _distren_asprintf(&file_name, "stor/job%d/stats.xml", job_number);
   doc = xmlParseFile(file_name);
   cur = xmlDocGetRootElement(doc);
   distrenjob->total_render_time = (time_t)atol((char*)xmlGetProp(cur, (xmlChar*)"total_render_time"));
   xmlFreeDoc(doc);
   distrenjob->frameset = malloc(sizeof(struct frameset) * distrenjob->total_frames);
   // change the status of all frames to "unassigned"
   counter2 = start_frame;
   for(counter = 0; counter <= distrenjob->total_frames; counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
     counter2++;
+  }
   restoreJobState(distrenjob);
   return distrenjob;
+}
 int updateJobStatsXML(struct distrenjob *job)
+{
 	  xmlTextWriterPtr writer;
 	  char *tmp; // temporarily holds strings to be given to the xml writer
 	  _distren_asprintf(&tmp, "stor/job%d/stats.xml", job->jobnum);
 	  // create xml document at the location tmp with no compression
 	  writer = xmlNewTextWriterFilename(tmp, 0);
 	  xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
 	  xmlTextWriterStartElement(writer, (xmlChar*)"stats");
 	  _distren_asprintf(&tmp, "%d", job->assigned_frames);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"assigned_frames", (xmlChar*)tmp);
 	  _distren_asprintf(&tmp, "%d", job->completed_frames);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"completed_frames", (xmlChar*)tmp);
 	  _distren_asprintf(&tmp, "%d", job->total_render_time);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"total_render_time", (xmlChar*)tmp);
 	  // end document
 	  xmlTextWriterEndDocument(writer);
 	  // free writer and save xml file to disk
 	  xmlFreeTextWriter(writer);
 	  return 1;
+}
 // returns 1 if successful
 // updates job_list.xml which lists all the jobs in the queue
 int updateJobListXML(struct distrenjob *head)
+{
   struct distrenjob *job;
   xmlTextWriterPtr writer;
   char *tmp;
   char *tmp2;
   int counter;
   // update timestamp
   general_info.timestamp++;
   if(general_info.timestamp > 65530)
 		  general_info.timestamp = 0;
   writer = xmlNewTextWriterFilename("job_list.xml", 0);
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   // create root element job_list
   xmlTextWriterStartElement(writer, (xmlChar*)"job_list");
   _distren_asprintf(&tmp, "%d", general_info.timestamp);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"timestamp", (xmlChar*)tmp);
   general_info.total_priority_pieces = 0;
   counter = 0;
   for(job = head->next; job; job = job->next)
+    {
       _distren_asprintf(&tmp, "jobnum%d", counter);
       _distren_asprintf(&tmp2, "%d", job->jobnum);
       xmlTextWriterWriteElement(writer, (xmlChar*)tmp, (xmlChar*)tmp2);
       // this is needed for the new frame finder to work
       general_info.total_priority_pieces = general_info.total_priority_pieces + (11 - job->priority);
       counter++;
+    }
   // close elements and end document
   xmlTextWriterEndDocument(writer);
   // free writer and save xml file to disk
   xmlFreeTextWriter(writer);
   return 1;
+}
 // returns 1 if completed successfully, 0 if not
 // this reads a list of jobs in the queue before DistRen was shut down
 // and then adds the jobs to the queue, as if it were never shut down
 int createQueueFromXML(struct distrenjob *head)
+{
   xmlDocPtr doc;  // holds xml document in memory
   xmlNodePtr cur; // points to the current xml element node
   // load xml document
   doc = xmlParseFile("job_list.xml");
   if(doc == NULL)
+    {
       fprintf(stderr, "createQueueFromXML: document not found\n");
       return 0;
+    }
   // have cur point to the root element of the xml document pointed to by doc
   cur = xmlDocGetRootElement(doc);
   if(cur == NULL)
+    {
       fprintf(stderr, "createQueueFromXML: document empty\n");
       return 0;
+    }
   if(xmlStrcmp(cur->name, (const xmlChar*)"job_list"))
+    {
       fprintf(stderr, "createQueueFromXML: incorrect root element (%s)", (char*)cur->name);
+    }
   // moves into the children elements of job_list
   cur = cur->xmlChildrenNode;
   reCreateQueueFromXML(head, doc, cur);
   /* scans the list of all jobs that were in queue before DistRen shutdown
   while(cur != NULL)
+    {
       tmp = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
       fprintf(stderr, "adding job: %s", tmp);
       // add job from job number @TODO create function with parameters (struct distrenjob *head, int job_number)
       // LordOfWar calls dibs on above todo
       xmlFree(tmp);
       cur = cur->next; // go to next child element of job_list element
     }*/
   xmlFreeDoc(doc);
   return 1;
+}
 // inserts jobs at front of queue, starting with the last job in the job_list xml file
 // to preserve the order of the queue
 int reCreateQueueFromXML(struct distrenjob *head, xmlDocPtr doc, xmlNodePtr current)
+{
   struct distrenjob *holder; // holds the job that "was" after head, so that the new struct can be inserted after head
   struct distrenjob *job; // job to be added
   xmlChar *tmp;
   int job_num;
   if(current == NULL) // base case, if element doesn't exist then don't do anything
     return 0;
   // recursively call itself so that the next job in the queue is added to the front before the current one
   reCreateQueueFromXML(head, doc, current->next);
   // now actual work is done, adding the job to the front of the queue
   holder = head->next; // initialize holder
   tmp = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); // get job number
   job_num = atoi((char*)tmp);
   job = createJobFromXML(job_num);
   xmlFree(tmp); // free xml char (that holds the job number)
   // insert job at front of the queue
   head->next = job;
   job->next = holder;
   return 1;
+}
 /* ************************** Test Functions ************************* */
 int printFrameInfo(struct frameset *frame)
+{
   char *status;
   status = NULL;
   switch(frame->status)
+  {
     case FRAMESETSTATUS_UNASSIGNED:
       _distren_asprintf(&status, "%s", "unassigned");
       break;
     case FRAMESETSTATUS_ASSIGNED:
       _distren_asprintf(&status, "%s", "assigned");
       break;
     case FRAMESETSTATUS_DONE:
       _distren_asprintf(&status, "%s", "completed");
       break;
     case FRAMESETSTATUS_CANCELED:
       _distren_asprintf(&status, "%s", "canceled");
+  }
   printf("frame #: %d --> %s\n", frame->num, status);
   return 1;
+}
 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;
+}
 int printJobInfo(struct distrenjob *job)
+{
   fprintf(stderr, "type: %d\n", job->type);
   fprintf(stderr, "name: %s\n", job->email);
   fprintf(stderr, "submitter: %s\n", job->submitter);
   fprintf(stderr, "e-mail: %s\n", job->email);
   fprintf(stderr, "priority: %d\n", job->priority);
   fprintf(stderr, "completed: %d\n", job->completed_frames);
   fprintf(stderr, "assigned: %d\n", job->assigned_frames);
   fprintf(stderr, "total: %d\n", job->total_frames);
   fprintf(stderr, "watchdog: %d\n", job->watchdog_forgiveness);
   fprintf(stderr, "hibernate: %d\n", job->hibernate);
   fprintf(stderr, "prev_frame: %d\n", job->prev_frame_index);
   fprintf(stderr, "render power: %ld\n", job->assigned_render_power);
   return 1;
+}
 int printAllJobnums(struct distrenjob *head)
+{
   struct distrenjob *current_job;
   int total_jobs;
   fprintf(stderr, "job numbers in the order they will be processed:\n");
   total_jobs = 0;
   for(current_job = head->next; current_job; current_job = current_job->next)
+    {
       fprintf(stderr, "%d: %s\n", current_job->jobnum, current_job->name);
       total_jobs++;
+    }
   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
   struct distrenjob head;
   int cont;
   struct distrend_clientset *clients;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   // initialize general_info struct, this should be done by start_data()
   general_info.jobs_in_queue = 0;
   general_info.free_clients = 0;
   general_info.rendering_clients = 0;
   general_info.total_finished_jobs = 0;
   general_info.total_frames_rendered = 0;
   general_info.highest_jobnum = 0;
   general_info.hibernate = 0;
   general_info.timestamp = 0;
   general_info.total_render_power = 0;
   general_info.total_priority_pieces = 0;
   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));
   distrend_do_config(argc, argv, &config);
   //start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
   // pre-loaded jobs for testing
   prepare_distrenjob(&head, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 8, 1, 100, 640, 480);
   prepare_distrenjob(&head, 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");
     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));
       break;
     case 3:
       general_info.total_render_power++;
       if(!find_jobframe_again(&head, -1, 1, &tmp_job, &tmp_frame))
+      {
     	  fprintf(stderr, "frame was found, details below\n");
           fprintf(stderr, "Job#:%d\n", tmp_job->jobnum);
           fprintf(stderr, "Frame#:%d\n", tmp_frame->num);
+      }
       break;
     case 4:
       name = NULL;
       submitter = NULL;
       email = NULL;
       fprintf(stderr, "\nType: \n\t 1 \t blender\n\t 2 \t povray\n"); scanf("%d", &type);
       fprintf(stderr, "\nName: ");        scanf("\n"); getline(&name, &read_buf, stdin);
       fprintf(stderr, "\nSubmitter: ");                getline(&submitter, &read_buf, stdin);
       fprintf(stderr, "\nEmail: ");                    getline(&email, &read_buf, stdin);
       fprintf(stderr, "\nPriority: ");                 scanf("%d", &priority);
       fprintf(stderr, "\nStart frame: ");              scanf("%d", &start_frame);
       fprintf(stderr, "\nEnd frame: ");                scanf("%d", &end_frame);
       fprintf(stderr, "\nWidth: ");                    scanf("%d", &width);
       fprintf(stderr, "\nHeight: ");                   scanf("%d", &height);
       prepare_distrenjob(&head, type, name, submitter, email, priority, start_frame, end_frame, width, height);
       break;
     case 5:
       fprintf(stderr, "\nJob number: ");
       scanf("%d", &jobnum);
       distrenjob_remove(&head, distrenjob_get(&head, jobnum));
       break;
     case 6:
       printAllJobnums(&head);
       break;
     case 7:
       fprintf(stderr, "\nHighest job number: %d", general_info.highest_jobnum);
       fprintf(stderr, "\nJobs in queue: %d", general_info.jobs_in_queue);
       fprintf(stderr, "\nTotal frames rendered: %d", general_info.total_frames_rendered);
       fprintf(stderr, "\nTimestamp: %d", 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;
     default:
       fprintf(stderr, "Invalid input, please try again.\n");
+    }
+  }
   distrend_listen(config, &clients);
   /* This is called the "main loop" */
   while(cont)
+    {
       struct distren_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(&action);
       cont = distrend_do(action);
       /* Make the following code more event-driven */
       frame_watchdog(&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(&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(config->listens, clients);
   distrend_config_free(config);
   xmlcleanup();
   return 0;
+}

src/server/distrenjob.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "asprintf.h"
 #include "distrenjob.h"
 #include "slavefuncs.h"
 #include "asprintf.h"
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 void distrenjob_free(struct distrenjob **distrenjob)
+{
   struct distrenjob *dj;
   dj = *distrenjob;
   xmlFree(dj->name);
   xmlFree(dj->submitter);
   xmlFree(dj->email);
   free(dj->frameset);
   free(dj);
   *distrenjob = NULL;
+}
 int distrenjob_new(struct distrenjob **distrenjob)
+{
   struct distrenjob *dj;
   dj = malloc(sizeof(struct distrenjob));
   if(!dj)
+    {
       /* try to catch code that doesn't respect return values
        faster: */
       *distrenjob = NULL;
       return 1;
+    }
   *distrenjob = dj;
   dj->next = NULL;
   dj->name = (char *)NULL;
   dj->submitter = (char *)NULL;
   dj->email = (char *)NULL;
   dj->jobnum = 0; /*< @todo there should be a central jobnum allocator and a way to save the maximum jobnumber allocated */
   dj->priority = 0;
   dj->width = 0;
   dj->height = 0;
   dj->completed_frames = 0;
   dj->assigned_frames = 0;
   dj->total_render_time = 0;
   dj->hibernate = 0;
   dj->prev_frame_index = -1;
   dj->assigned_render_power = 0;
   dj->watchdog_forgiveness = 3600; // initialize watchdog forgiveness at 1 hour
   dj->frameset = (struct frameset *)NULL; /*< @todo does frameset need to be initialized here? */
   return 0;
+}
 /**
    writes struct from xml
 */
 int xml2distrenjob(struct distrenjob **distrenjob, char *pathtoxml)
+{
   struct distrenjob *dj;
   xmlDocPtr xmldoc;
   xmlNodePtr xmlnode;
   xmlChar *xmlchar;
   xmlXPathContextPtr xmlxpathcontext;
   int tmp;
   if(distrenjob_new(distrenjob))
     return 1;
   dj = *distrenjob;
   xmldoc = xmlReadFile(pathtoxml, NULL, XML_PARSE_PEDANTIC);
   if(!xmldoc)
+    {
       /**
 	 @todo are we able to depend on libxml2's printed errors or
 	 channel them into syslog output (eventually)? Currently,
 	 this error is repetitious of a libxml2 error printed on stderr
 	 for us.
        */
       fprintf(stderr, "error reading XML file ``%s''\n", pathtoxml);
       distrenjob_free(distrenjob);
       return 2;
+    }
   xmlxpathcontext = xmlXPathNewContext(xmldoc);
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/distren/job");
   if(!xmlnode)
+    {
       distrenjob_free(distrenjob);
       return 3;
+    }
   /*< @todo should we use xmlChar everywhere too? */
   dj->name = (char *)xmlGetProp(xmlnode, (xmlChar *)"name");
   if(!dj->name)
+    {
       distrenjob_free(distrenjob);
       return 4;
+    }
   /*< @todo validation needs to be done on usernames. e.g., currently, they shouldn't contain the '"' char  */
   dj->submitter = (char *)xmlGetProp(xmlnode, (xmlChar *)"submitter");
   if(!dj->submitter)
+    {
       distrenjob_free(distrenjob);
       return 5;
+    }
   tmp = _distren_asprintf((char **)&xmlchar, "/distren/submitters/submitter[attribute::name=\"%s\"]", dj->submitter);
   if(tmp <= 0
      || !xmlchar)
+    {
       fprintf(stderr, "error using _distren_asprintf\n");
       distrenjob_free(distrenjob);
       return 6;
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, xmlchar);
   free(xmlchar);
   dj->email = (char *)xmlGetProp(xmlnode, (xmlChar *)"email");
   if(!dj->email)
+    {
       fprintf(stderr, "error getting email for user ``%s'' from ``%s''\n",
 	      dj->submitter, pathtoxml);
       distrenjob_free(distrenjob);
       return 7;
+    }
   xmlXPathFreeContext(xmlxpathcontext);
   xmlFreeDoc(xmldoc);
   return 0;
+}

src/server/slave.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "asprintf.h"
 #include "protocol.h"
 #include "options.h"
 #include "remoteio.h"
 #include "slavefuncs.h"
 #include "asprintf.h"
 #include "remoteio.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 int main(int argc, char *argv[])
+{
   int counter;
   /* Parse arguments */
   for(counter = 0; counter < argc; counter ++)
     if(strcmp(argv[counter], "-h") == 0)
+      {
 	fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-h\tshow this help\n");
 	return 2;
+      }
   /* Get conf data */
   char *username;
   char *datadir;
   cfg_t * my_cfg;
   cfg_opt_t myopts[] = {
     CFG_SIMPLE_STR("username", &username),
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_END()
   };
   struct options_common *commonopts;
   username = NULL;
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
   /* Notifies the user if there no username in .conf */
   if(username == NULL || strcmp(username, "!username") == 0 )
     fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
   else
     if( username != NULL || strcmp(username, "!username") != 0 )
+      {
 	// Log in the user
 	if(login_user(username) == 1){
 	  fprintf(stderr, "You should now be logged into distren.\n");
+	}
 	else
+	  {
 	    fprintf(stderr, "Login failed, please check your username. If you have not registered, please do so on the DistRen website.\n");
 	    return 0;
+	  }
+      }
     else
+      {
 	fprintf(stderr, "Please check your distrenslave.conf, it appears to be incorrectly formatted.\n");
+      }
   int jobnum = 0;
   int framenum = 0;
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   char *urltoOutput;   /* Full URL where output is posted */
   char *pathtoJobfile; /* Full path to the job's main file */
   char *pathtoXml;     /* Full path to the job's xml file */
   char *pathtoOutput;  /* Full path to the output (rendered) file */
   char *outputExt;     /* Output Extension (e.g., JPG) */
   char *tarcmd;        /* Command to run for tar. Migrate to libtar sometime */
   char *outdir;        /* Output Directory for tar */
   char *jobdatapath;   /* Path to job data */
   struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
   int haveWork = 0;
   while(1)
+    {
     tell_the_server(0); // Give me some work!
     /* If we got a frame */
     if(haveWork)
+      {
         /* @TODO: Add remotio hooks */
         // jobnum = remoteio_read(jobnum); /* Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile */
         //framenum = remoteio_read(jobnum); /* Set framenum from remoteio */
         fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
         // Variable Preparation
         _distren_asprintf(&jobdatapath, "job%d", jobnum);
         _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz", jobnum); // Prepares URL to download from
         _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
         _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
         _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted
         _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml", datadir, jobnum ); // Prepares the path to the job's XML file
         free(jobdatapath);
         // Prepare to download the job tar if it isn't  present
         struct stat buffer;
         int fstatus = stat(pathtoJobfile, &buffer);
         if(fstatus == -1)
+          {
             // Download the Tar
             if( curlget(urltoTar, pathtoTar) == 0){
               fprintf(stderr, "Job data retrieved successfully\n");
               free(urltoTar);
+            }
             else {
               fprintf(stderr, "Downloading job data from server failed. Check your network connection.\n");
               return 1; // for now
+            }
+          }
         else
           fprintf(stderr, "Using cached job file...\n");
         _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @TODO: free() */
         mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
         mkdir(outdir, 0750);
         _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
         system(tarcmd);
         free(tarcmd);
         free(pathtoTar);
         free(outdir);
         /* Parses a job's XML file, puts data in the myjob struct */
         if(xml2distrenjob(&myjob, pathtoXml) == 0)
+          {
             fprintf(stderr, "Well, the XML craziness may have worked. Maybe. \n");
             free(pathtoXml);
             /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */
             distrenjob_free(&myjob);
+          }
         else
+          {
             fprintf(stderr, "I think the XML craziness may have failed, so I'll terminate just for fun.\n");
             return 1;
+          }
         /* Variable-fillers which require XML */
         outputExt = myjob->output_format; /* @TODO: FIXME! <-- I WILL! */
         /* Prepares the path to the jobfile */
         _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt );
         free(outputExt);
         /* Execute blender */
         if(exec_blender(pathtoJobfile, pathtoOutput, framenum)){ /* @TODO: This warning should be fixed :D */
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.");
             return 1;
+        }
         free(pathtoJobfile);
         /* When blender is finished, run this... */
         fprintf(stderr, "Finished frame %d in job %d, uploading...", framenum, jobnum);
         if( !curlpost(pathtoOutput, urltoOutput)){ // Uploads output
           fprintf(stderr,"Upload successful, removing old output...\n");
           remove(pathtoOutput); // Delete the file after its uploaded
+        }
         else{
           fprintf(stderr,"Upload failed. Check your network connection. Trying again...");
           int tries=0;
           while(tries<10 && curlpost(pathtoOutput, urltoOutput)){
               fprintf(stderr, "Upload failed. Trying again in 10 seconds... (attempt %d of 10)", tries);
               tries++;
               sleep(10);
+          }
           // @TODO: Keep track of files that we were unable to upload, and upload them later
+        }
         free(urltoOutput);
         free(pathtoOutput);
         tell_the_server(DISTREN_REQUEST_DONEFRAME); /* Tells the server that it's done rendering, and upload is done */
+      }
     else
       fprintf(stderr,"Nothing to do. Idling...\n");
     // If the server says that every frame for the last jobnum is finished, OR if the data is getting old
     if(1 == 0){
       // Note: individual frames are already deleted after uploading,
       // except for ones that couldn't be uploaded
       delete_jobdata(jobnum, datadir);
+    }
     sleep(5); // Poll 5 seconds. @TODO: Remove all polling
+  }
   return 0;
+}

src/server/slavefuncs.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "protocol.h"
 #include "asprintf.h"
 #include "slavefuncs.h"
 #include "distrenjob.h"
 #include "execio.h"
 #include "protocol.h"
 #include "slavefuncs.h"
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/types.h>
 #include <curl/easy.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 /**
  utility function for XPath-ish stuff:
  */
 xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path)
+{
   xmlNodePtr toreturn;
   xmlXPathObjectPtr xmlxpathobjptr;
   xmlxpathobjptr = xmlXPathEval(path, xpathctxt);
   if(!xmlxpathobjptr
      || !xmlxpathobjptr->nodesetval->nodeNr)
+    {
       fprintf(stderr, "XPath resolution failed for ``%s'' in ``%s'' (``%s'')\n", path, xpathctxt->doc->name, xpathctxt->doc->URL);
       return (xmlNodePtr)NULL;
+    }
   toreturn = *(xmlxpathobjptr->nodesetval->nodeTab);
   xmlXPathFreeObject(xmlxpathobjptr);
   return toreturn;
+}
 /** Stub for deleting job data from the disk. @TODO: unstubify me! */
 int delete_jobdata(int jobnum, char *datadir)
+{
   char *jobpath;
   _distren_asprintf(&jobpath, "%s/%d", datadir, jobnum);
   // rmdir(jobpath);
   fprintf(stderr, "Please manually remove %s. Automatic removal is currently not implemented.\n", jobpath);
   return 0;
+}
 /** Stub @TODO: Replace with remotio */
 void tell_the_server(int stuff){
+}
 /** Function referenced by curlget() to write data to disk. */
 size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream)
+ {
     return fwrite(ptr, size, nmemb, stream);
+  }
 /** Helper function for cURL's progress display */
 int curl_progress( char *Bar,double t,double d,double ultotal,double ulnow)
+{
 fprintf(stderr,"Downloading: %f%% complete\r",d/t*100);
 return 0;
+}
 /** Retrieves a URL with cURL and saves it to disk */
 int curlget(char *url, char *out){
   fprintf(stderr,"Preparing to download %s",url);
   double *Bar; // Stores cURL progress display info
   CURL *curl;
   CURLcode res;
   FILE *outfile;
   curl = curl_easy_init();
   if(curl) {
 	outfile = fopen(out, "w"); // Open where we're writing to
   curl_easy_setopt(curl, CURLOPT_URL, url);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_writetodisk); // this MUST be set for win32 compat.
   curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
   curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_progress);
   curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &Bar);
   res = curl_easy_perform(curl);
   curl_easy_cleanup(curl);
+  }
   fprintf(stderr,"\n"); // Clears out he progressbar's carriage return
   return res; // 0 is OK, 1 is 404 or other error
+}
 /** Posts a file to a url with cUrl */
 int curlpost(char *filename, char *url){
   char *targetname = "uploadedfile"; // Name of the target in the php file on the server (Don't change me unless you have different PHP code)
   CURL *curl;
   CURLcode res;
   struct curl_httppost *formpost=NULL;
   struct curl_httppost *lastptr=NULL;
   struct curl_slist *headerlist=NULL;
   static const char buf[] = "Expect:";
   curl_global_init(CURL_GLOBAL_ALL);
   /* upload field... */
   curl_formadd(&formpost,
                &lastptr,
                CURLFORM_COPYNAME, targetname,
                CURLFORM_FILE, filename,
                CURLFORM_END);
   /* filename field... */
   curl_formadd(&formpost,
                &lastptr,
                CURLFORM_COPYNAME, "filename",
                CURLFORM_COPYCONTENTS, filename,
                CURLFORM_END);
   /* submit field, not usually needed, just in case... */
   curl_formadd(&formpost,
                &lastptr,
                CURLFORM_COPYNAME, "submit",
                CURLFORM_COPYCONTENTS, "send",
                CURLFORM_END);
   curl = curl_easy_init();
   headerlist = curl_slist_append(headerlist, buf);
   if(curl) {
     /* Setting the URL to get the post, and the contents of the post */
     curl_easy_setopt(curl, CURLOPT_URL, url);
     curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
     res = curl_easy_perform(curl);
     curl_easy_cleanup(curl);
     /* cleanup the formpost junk */
     curl_formfree(formpost);
     curl_slist_free_all (headerlist);
+  }
   return res;
+}
 /** Logs the user into the server after ensuring that keys exist */
 int login_user(char *username)
+{
   // @TODO: Put some telnet-style auth code here
   return 1; // success
+}
 /** Replaces !username with a username in the slave's conf file */
 int conf_replace(char *username){
   int maxlinelen = 120;
   char *fileOrig = SYSCONFDIR "/distrenslave.conf";
   char *fileRepl = SYSCONFDIR "/distrenslave.conf.edited";
   char *text2find = "!username";
   char *text2repl = username;
   char buffer[maxlinelen+2];
   char *buff_ptr, *find_ptr;
   FILE *fp1, *fp2;
   size_t find_len = strlen(text2find);
   fp1 = fopen(fileOrig,"r");
   fp2 = fopen(fileRepl,"w");
   if (fp1 ==NULL){
     fprintf(stderr, "%s doesn't exist\n",fileOrig);
     return 0;
+  }
   else if(fp2 ==NULL){
     fprintf(stderr, "Can't write a file to disk! Check permissions.\n");
     return 0;
+  }
   else{
     while(fgets(buffer,maxlinelen+2,fp1))
+      {
         buff_ptr = buffer;
         while ((find_ptr = strstr(buff_ptr,text2find)))
+        {
            while(buff_ptr < find_ptr)
              fputc((int)*buff_ptr++,fp2);
            fputs(text2repl,fp2);
            buff_ptr += find_len;
+         }
          fputs(buff_ptr,fp2);
+      }
     rename(fileRepl, fileOrig);
+  }
   fclose(fp2);
   fclose(fp1);
   fprintf(stderr,"Wrote conf file...\n");
 return 1; // Success
+}
 /* Executors */
 /** Executor function for Blender operations */
 int exec_blender(char *input, char *output, int frame)
+{
   fprintf(stderr,"Preparing to execute...\n");
   int ret;
   char *frame_str;
   char *command = "blender"; // @TODO: append .exe if win32? Do we expect this to be in the PATH?
   char *cmd[] = { command, "-b", "-o", output, input, "-f", frame_str, (char *)NULL };
   char buf[10];
   struct execio *testrem;
   size_t readlen;
   _distren_asprintf(&frame_str, "%i", frame);
   ret = execio_open(&testrem, command, cmd);
   buf[9] = '\0';
   while(!execio_read(testrem, buf, 9, &readlen))
+    {
       if(readlen > 9) {
         fprintf(stderr, "Something is terribly wrong!\n");
+       }
        buf[readlen] = '\0';
        fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   return ret;
+}
 void xmlinit()
+{
   xmlInitParser();
   xmlXPathInit();
+}
 void xmlcleanup()
+{
   xmlCleanupParser();
+}

src/server/user_mgr.c

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "user_mgr.h"
 #include "malloc.h"
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "user_mgr.h"
 struct user_mgr_info
+{
 	struct user *user_array;
 	int current_users;
 	int user_array_size;
 } user_mgr_info;
 int resize_user_array()
+{
 	int counter;
 	int counter2;
 	// create array twice the size of the current amount of users
 	user_mgr_info.user_array_size = user_mgr_info.current_users * 2;
 	struct user *new_user_array = malloc(sizeof(struct user) * user_mgr_info.user_array_size);
 	// this copies the original user_array over to the new one
 	// using two counters allows the array to be resized at any time
 	// leaving exactly 1 open space between each user when it is done;
 	counter2 = 0;
 	for(counter = 0; counter < user_mgr_info.current_users; counter++)
+	{
 		if(user_mgr_info.user_array[counter].username != 0)
+		{
 			new_user_array[counter2*2] = user_mgr_info.user_array[counter];
 			counter2++;
+		}
+	}
 	// cleanup old array
 	free(user_mgr_info.user_array);
 	// change the pointer to point to the new user array
 	user_mgr_info.user_array = new_user_array;
 	return 1;
+}
 struct user *findUser(char *nameOfUser)
+{
 	int high;
 	int low;
 	int middle;
 	int result;
 	high = user_mgr_info.user_array_size - 1;
 	low = 0;
 	for(middle = (low+high)/2; 1 == 1; middle = (low+high)/2)
+	{
 		// in case middle lands on a part of the array with no user
 		while(user_mgr_info.user_array[middle].username == 0)
+		{
 			if(result < 0)
 				middle--;
 			else
 				middle++;
+		}
 		// this is where the array is cut in half and the half that the nameOfUser is on is kept
 		result = strcmp(nameOfUser, user_mgr_info.user_array[middle].username);
 		if(result == 0)
 			return &user_mgr_info.user_array[middle];
 		else if(result < 0)
 			high = middle;
 		else
 			low = middle;
 		// in case the user doesn't exist
 		if(high-low <= 0)
 			return 0;
+	}
+}
 int deleteUser(struct user *user_ptr)
+{
 	free(user_ptr->username);
 	memset(user_ptr, '\0', sizeof(struct user));
 	return 1;
+}
 int createUser(struct user *user_ptr, char *nameOfUser)
+{
 	// clear old memory
 	memset(user_ptr, '\0', sizeof(struct user));
 	user_ptr->username = nameOfUser;
 	user_ptr->render_power = 0;
 	user_ptr->last_job = 0;
 	return 1;
+}
 // places the new user at position index in the array, moves other users if it needs to
 int placeUser(int index, char *nameOfUser)
+{
 	int higher;
 	int lower;
 	// I shift data in the array to create an open the space where the user should be added
 	// but first I figure out which way is the shortest
 	if(user_mgr_info.user_array[index].username != 0)
+	{
 		higher = index + 1;
 		while(user_mgr_info.user_array[higher].username != 0)
 			higher++;
 		lower = index - 1;
 		while(user_mgr_info.user_array[lower].username != 0)
 			lower--;
 		// here the data is shifted to open up a space
 		if(index - lower < higher - index)
 			for(; lower < index; lower++)
 				memcpy(&user_mgr_info.user_array[lower], &user_mgr_info.user_array[lower + 1], sizeof(struct user));
 		else
 			for(; higher > index; higher--)
 				memcpy(&user_mgr_info.user_array[higher], &user_mgr_info.user_array[higher - 1], sizeof(struct user));
+	}
 	// add the user to the array
 	createUser(&user_mgr_info.user_array[index], nameOfUser);
 	return 1;
+}
 int addUser(char *nameOfUser)
+{
 	int high;
 	int low;
 	int middle;
 	int result;
 	high = user_mgr_info.user_array_size - 1;
 	low = 0;
 	for(middle = (low+high)/2; 1 == 1; middle = (low+high)/2)
+	{
 		// in case middle lands on a part of the array with no user
 		while(user_mgr_info.user_array[middle].username == 0)
+		{
 			if(result < 0)
 				middle--;
 			else
 				middle++;
+		}
 		// this is where the array is cut in half and the half that the nameOfUser is on is kept
 		result = strcmp(nameOfUser, user_mgr_info.user_array[middle].username);
 		if(result == 0)
 			return 0;
 		else if(result < 0)
 			high = middle;
 		else
 			low = middle;
 		// once there are less than 10 possible places for the user to be placed
 		// break out of this loop and begin next loop
 		if(high-low <= 10)
 			break;
+	}
 	// this function starts at the low index number, and goes up until it finds a
 	// username that is bigger than it alphabetically, and tells the userPlacer
 	// that it needs to go 1 before that spot
 	for(; low <= high; low++)
+	{
 		while(user_mgr_info.user_array[low].username == 0)
 			low++;
 		result = strcmp(nameOfUser, user_mgr_info.user_array[low].username) < 0;
 		if(result < 0)
+		{
 			placeUser(low - 1, nameOfUser);
 			return 1;
+		}
 		if(result == 0)
+		{
 			fprintf(stderr, "user already exists");
 			return 0;
+		}
+	}
 	return 0;
+}
 int initialize_users()
+{
 	// pull data from XML file
 	// if XML file is not found create new array of size 50
 	return 1;
+}

0 comments (0 inline, 0 general)