Changeset - 5b7ab20c5306
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Nathan Brink (binki) - 16 years ago 2009-12-20 16:13:12
ohnobinki@ohnopublishing.net
style fixes, move distrenjob_unserialize() to distrenjob.*, more struct geninfo use
4 files changed with 186 insertions and 125 deletions:
src/server/distrend.c
87
120
src/server/distrenjob.c
86
1
src/server/distrenjob.h
11
2
src/server/slave.c
2
2
0 comments (0 inline, 0 general)
src/server/distrend.c
➞
Show inline comments
 
@@ -35,18 +35,18 @@
 
#include <string.h>
 
#include <sys/stat.h>
 
#include <sys/types.h>
 
#include <time.h>
 
#include <unistd.h>
 

			




	
	
	
		
 
#include <libxml/xmlmemory.h>

			




	
	
	
		
 
#include <libxml/encoding.h>

			




	
	
	
		
 
#include <libxml/parser.h>

			




	
	
	
		
 
#include <libxml/tree.h>

			




	
	
	
		
 
#include <libxml/encoding.h>

			




	
	
	
		
 
#include <libxml/xmlmemory.h>

			




	
	
	
		
 
#include <libxml/xmlreader.h>

			




	
	
	
		
 
#include <libxml/xmlwriter.h>

			




	
	
	
		
 
#include <libxml/xmlreader.h>

			




	
	
	
		
 

			




	
	
	
		
 
/* local defs */

			




	
	
	
		
 
#define NUMBER_ELEVEN 11

			




	
	
	
		
 

			




	
	
	
		
 
/* ******************* Structs ************************ */

			




	
	
	
		
 

			




	
	
		
 
@@ -75,20 +75,20 @@ struct general_info

			




	
	
	
		
 
*/

			




	
	
	
		
 
void distrenjob_remove(struct general_info *, struct distrenjob *bj);

			




	
	
	
		
 

			




	
	
	
		
 
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 distrenjob_serialize(struct general_info *geninfo, struct distrenjob *job);

			




	
	
	
		
 
int update_xml_joblist(struct general_info *);

			




	
	
	
		
 
int createQueueFromXML(struct distrenjob *head);

			




	
	
	
		
 
int reCreateQueueFromXML(struct distrenjob *head, xmlDocPtr doc, xmlNodePtr current);

			




	
	
	
		
 
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*);

			




	
	
	
		
 
int updateJobStatsXML(struct distrenjob *job);

			




	
	
	
		
 

			




	
	
	
		
 
char *job_getserialfilename(struct general_info *, unsigned int jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
/* ********************** 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()

			




	
	
	
		
 
{

			




	
	
		
 
@@ -141,13 +141,13 @@ int start_data(struct general_info *gene

			




	
	
	
		
 

			




	
	
	
		
 
      fprintf(stderr, "Parsing XML files and restoring previous state...\n");

			




	
	
	
		
 
      if(import_general_info(general_info))

			




	
	
	
		
 
	fprintf(stderr, "FAILURE\n");

			




	
	
	
		
 
      

			




	
	
	
		
 
      fprintf(stderr, "Restoring queue...\n");

			




	
	
	
		
 
      if(createQueueFromXML(&general_info->head))

			




	
	
	
		
 
      if(createQueueFromXML(general_info))

			




	
	
	
		
 
	fprintf(stderr, "FAILURE\n");

			




	
	
	
		
 
      

			




	
	
	
		
 
      fprintf(stderr, "done\n");

			




	
	
	
		
 
    }

			




	
	
	
		
 
  

			




	
	
	
		
 
  return 0;

			




	
	
		
 
@@ -177,32 +177,41 @@ int mortition(struct general_info *genin

			




	
	
	
		
 
  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);

			




	
	
	
		
 
      _distren_asprintf(&path_and_number, "%s/stor/job%d/out/%d.%s",

			




	
	
	
		
 
			geninfo->config->datadir,

			




	
	
	
		
 
			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--;

			




	
	
	
		
 
          geninfo->total_frames_rendered--;

			




	
	
	
		
 
          isJobDone = 0; // if a missing frame is found, set isJobDone to false

			




	
	
	
		
 
	  /** if a missing frame is found, set isJobDone to false */

			




	
	
	
		
 
          isJobDone = 0;

			




	
	
	
		
 
        }

			




	
	
	
		
 
      free(path_and_number);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
  if(isJobDone) // if all frames were accounted for

			




	
	
	
		
 
  /** if all frames were accounted for */

			




	
	
	
		
 
  if(isJobDone)

			




	
	
	
		
 
    {

			




	
	
	
		
 
      distrenjob_remove(geninfo, job);

			




	
	
	
		
 
      distrenjob_free(&job);

			




	
	
	
		
 
      geninfo->jobs_in_queue --;

			




	
	
	
		
 
      update_xml_joblist(geninfo);

			




	
	
	
		
 
    }

			




	
	
	
		
 
  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

			




	
	
	
		
 
  }

			




	
	
	
		
 
  else

			




	
	
	
		
 
    /**

			




	
	
	
		
 
       if the job isn't done, have frame_finder() start from the first frame, allowing it to see the frames that are now unassigned 

			




	
	
	
		
 
    */

			




	
	
	
		
 
    job->prev_frame_index = -1;

			




	
	
	
		
 

			




	
	
	
		
 
  update_general_info(geninfo);

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -216,32 +225,34 @@ int restoreJobState(struct distrenjob *j

			




	
	
	
		
 
  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);

			




	
	
	
		
 
      _distren_asprintf(&path_and_number, "stor/job%d/out/%d.%s", job->jobnum, job->frameset[counter].num, job->output_format); /*< @TODO this path is used in multiple places, construct/build/determine it in a central function */

			




	
	
	
		
 
      if(stat(path_and_number, &buffer) == 0)

			




	
	
	
		
 
        {

			




	
	
	
		
 
          job->frameset[counter].status = FRAMESETSTATUS_ASSIGNED;

			




	
	
	
		
 
          job->completed_frames++;

			




	
	
	
		
 
        }

			




	
	
	
		
 
      else

			




	
	
	
		
 
        isJobDone = 0;

			




	
	
	
		
 
      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 counter2;

			




	
	
	
		
 
  int counter;

			




	
	
	
		
 
  int tmp;

			




	
	
	
		
 
  char *path_with_num;

			




	
	
	
		
 
  char *serialfile;

			




	
	
	
		
 

			




	
	
	
		
 
  struct distrenjob *distrenjob;

			




	
	
	
		
 
  tmp = distrenjob_new(&distrenjob);

			




	
	
	
		
 
  if(tmp)

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




	
	
		
 
@@ -270,17 +281,22 @@ int prepare_distrenjob(struct general_in

			




	
	
	
		
 
    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);

			




	
	
	
		
 
  fprintf(stderr, ">>NOT<< creating dir ``%s''\n", path_with_num); /*< @TODO recursively create job directory */

			




	
	
	
		
 
  serialfile = job_getserialfilename(geninfo, distrenjob->jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  free(path_with_num);

			




	
	
	
		
 

			




	
	
	
		
 
  /* add job to queue */

			




	
	
	
		
 
  fprintf(stderr, "\nprepare_distrenjob: attempting distrenjob_serialize()\n");

			




	
	
	
		
 
  distrenjob_serialize(geninfo, distrenjob);

			




	
	
	
		
 
  distrenjob_serialize(distrenjob, serialfile);

			




	
	
	
		
 
  free(serialfile);

			




	
	
	
		
 

			




	
	
	
		
 
  fprintf(stderr, "\nprepare_distrenjob: attempting distrenjob_enqueue()\n");

			




	
	
	
		
 
  distrenjob_enqueue(geninfo, distrenjob);

			




	
	
	
		
 

			




	
	
	
		
 
  geninfo->jobs_in_queue ++;

			




	
	
	
		
 
  fprintf(stderr, "\nprepare_distrenjob: attempting update_xml_joblist()\n");

			




	
	
	
		
 
  update_xml_joblist(geninfo);

			




	
	
		
 
@@ -324,16 +340,18 @@ int distrenjob_enqueue(struct general_in

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head */

			




	
	
	
		
 
int change_job_priority(struct general_info *geninfo, struct distrenjob *job, int new_priority){

			




	
	
	
		
 
  struct distrenjob *current_job;

			




	
	
	
		
 
  struct distrenjob *prev_job;

			




	
	
	
		
 
  char *serialname;

			




	
	
	
		
 

			




	
	
	
		
 
  distrenjob_remove(geninfo, job);

			




	
	
	
		
 
  job->priority = new_priority;

			




	
	
	
		
 
  struct distrenjob *current_job;

			




	
	
	
		
 
  struct distrenjob *prev_job;

			




	
	
	
		
 

			




	
	
	
		
 
  prev_job = &geninfo->head;

			




	
	
	
		
 

			




	
	
	
		
 
  if(job->frameset[0].status == FRAMESETSTATUS_UNASSIGNED)

			




	
	
	
		
 
    /**

			




	
	
	
		
 
       if job was not yet started

			




	
	
		
 
@@ -354,13 +372,16 @@ int change_job_priority(struct general_i

			




	
	
	
		
 

			




	
	
	
		
 
    prev_job->next = job;

			




	
	
	
		
 
    job->next = current_job;

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
  update_xml_joblist(geninfo);

			




	
	
	
		
 
  distrenjob_serialize(geninfo, job); // because priority is changed

			




	
	
	
		
 
  /** reserialize after changes */

			




	
	
	
		
 
  serialname = job_getserialfilename(geninfo, job->jobnum);

			




	
	
	
		
 
  distrenjob_serialize(job, serialname);

			




	
	
	
		
 
  free(serialname);

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  Frame Finder: matches your computer up with a lovely frame to render, starts looking at oldest job first

			




	
	
		
 
@@ -631,17 +652,17 @@ int distrend_do_config(int argc, char *a

			




	
	
	
		
 
  struct distrenjob *distrenjob;

			




	
	
	
		
 
  cfg_t *cfg_listen;

			




	
	
	
		
 

			




	
	
	
		
 
  int tmp;

			




	
	
	
		
 

			




	
	
	
		
 
  /*

			




	
	
	
		
 
   * test xml2distrenjob()

			




	
	
	
		
 
   * test distrenjob_unserialize()

			




	
	
	
		
 
   */

			




	
	
	
		
 
  tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");

			




	
	
	
		
 
  tmp = distrenjob_unserialize(&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);

			




	
	
	
		
 
    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__);

			




	
	
	
		
 

			




	
	
	
		
 
  *config = malloc(sizeof(struct distrend_config));

			




	
	
		
 
@@ -733,108 +754,26 @@ int import_general_info(struct general_i

			




	
	
	
		
 

			




	
	
	
		
 
  xmlFreeDoc(doc);

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   serializes a distrenjob into XML

			




	
	
	
		
 
*/

			




	
	
	
		
 
int distrenjob_serialize(struct general_info *geninfo, struct distrenjob *job)

			




	
	
	
		
 
{

			




	
	
	
		
 
  xmlTextWriterPtr writer;

			




	
	
	
		
 
  char *tmp;

			




	
	
	
		
 
  char *tmpfile;

			




	
	
	
		
 
  char *outfile;

			




	
	
	
		
 
  int tmprtn;

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmpfile, "%s/stor/job%d/.job_info.xml", geninfo->config->datadir, job->jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  /* create xml document at the location tmp with no compression */

			




	
	
	
		
 
  writer = xmlNewTextWriterFilename(tmpfile, 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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     write resolution element and add its attributes */

			




	
	
	
		
 
  xmlTextWriterStartElement(writer, (xmlChar*)"resolution");

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->width);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"width", (xmlChar*)tmp);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->height);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"height", (xmlChar*)tmp);

			




	
	
	
		
 
  free(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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->frameset[(job->total_frames - 1)].num);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"end_fame", (xmlChar*)tmp);

			




	
	
	
		
 
  free(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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     end document */

			




	
	
	
		
 
  xmlTextWriterEndDocument(writer);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     free writer and save xml file to disk */

			




	
	
	
		
 
  xmlFreeTextWriter(writer);

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&outfile, "%s/stor/job%d/job_info.xml", geninfo->config->datadir, job->jobnum);

			




	
	
	
		
 
  tmprtn = rename(tmpfile, outfile);

			




	
	
	
		
 
  if(tmprtn == -1)

			




	
	
	
		
 
    {

			




	
	
	
		
 
      fprintf(stderr, "%s:%d: Error renaming ``%s'' to ``%s''\n",

			




	
	
	
		
 
	      __FILE__, __LINE__,

			




	
	
	
		
 
	      tmpfile, outfile);

			




	
	
	
		
 
      perror("rename");

			




	
	
	
		
 
      tmprtn = 1;

			




	
	
	
		
 
    }

			




	
	
	
		
 
  free(tmpfile);

			




	
	
	
		
 
  free(outfile);

			




	
	
	
		
 

			




	
	
	
		
 
  return tmprtn;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// 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)

			




	
	
	
		
 
struct distrenjob *createJobFromXML(struct general_info *geninfo, unsigned int jobnum)

			




	
	
	
		
 
{

			




	
	
	
		
 
  xmlDocPtr doc;

			




	
	
	
		
 
  xmlNodePtr cur;

			




	
	
	
		
 
  char *file_name;

			




	
	
	
		
 
  struct distrenjob *distrenjob;

			




	
	
	
		
 
  int start_frame;

			




	
	
	
		
 
  int counter;

			




	
	
	
		
 
  int counter2;

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&file_name, "stor/job%d/job_info.xml", job_number);

			




	
	
	
		
 
  file_name = job_getserialfilename(geninfo, jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  doc = xmlParseFile(file_name);

			




	
	
	
		
 
  if(!doc)

			




	
	
	
		
 
    return NULL;

			




	
	
	
		
 

			




	
	
	
		
 
  distrenjob_new(&distrenjob);

			




	
	
		
 
@@ -856,14 +795,14 @@ struct distrenjob *createJobFromXML(int 

			




	
	
	
		
 

			




	
	
	
		
 
  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);

			




	
	
	
		
 
  /** load up stats.xml file to retrieve data */

			




	
	
	
		
 
  _distren_asprintf(&file_name, "stor/job%d/stats.xml", jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  doc = xmlParseFile(file_name);

			




	
	
	
		
 
  cur = xmlDocGetRootElement(doc);

			




	
	
	
		
 

			




	
	
	
		
 
  distrenjob->total_render_time = (time_t)atol((char*)xmlGetProp(cur, (xmlChar*)"total_render_time"));

			




	
	
	
		
 

			




	
	
		
 
@@ -963,13 +902,13 @@ int update_xml_joblist(struct general_in

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 returns 0 if completed successfully

			




	
	
	
		
 
 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)

			




	
	
	
		
 
int createQueueFromXML(struct general_info *geninfo)

			




	
	
	
		
 
{

			




	
	
	
		
 
  int tmp;

			




	
	
	
		
 

			




	
	
	
		
 
  xmlDocPtr doc;  // holds xml document in memory

			




	
	
	
		
 
  xmlNodePtr cur; // points to the current xml element node

			




	
	
	
		
 

			




	
	
		
 
@@ -994,47 +933,60 @@ int createQueueFromXML(struct distrenjob

			




	
	
	
		
 
      fprintf(stderr, "createQueueFromXML: incorrect root element (%s)", (char*)cur->name);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
  // moves into the children elements of job_list

			




	
	
	
		
 
  cur = cur->xmlChildrenNode;

			




	
	
	
		
 

			




	
	
	
		
 
  tmp = reCreateQueueFromXML(head, doc, cur);

			




	
	
	
		
 
  tmp = reCreateQueueFromXML(geninfo, doc, cur);

			




	
	
	
		
 

			




	
	
	
		
 
  xmlFreeDoc(doc);

			




	
	
	
		
 

			




	
	
	
		
 
  return tmp;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// 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)

			




	
	
	
		
 
/**

			




	
	
	
		
 
   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 general_info *geninfo, 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

			




	
	
	
		
 
  if(reCreateQueueFromXML(head, doc, current->next))

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     recursively call itself so that the next job in

			




	
	
	
		
 
     the queue is added to the front before the current one

			




	
	
	
		
 
  */

			




	
	
	
		
 
  if(reCreateQueueFromXML(geninfo, doc, current->next))

			




	
	
	
		
 
    /**

			




	
	
	
		
 
       bail if failure recursevely

			




	
	
	
		
 
        ^-- is this the best thing to do in this case?

			




	
	
	
		
 
	@TODO bail-out cleanup

			




	
	
	
		
 
     */

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




	
	
	
		
 
  // now actual work is done, adding the job to the front of the queue

			




	
	
	
		
 
  holder = head->next; // initialize holder

			




	
	
	
		
 
  /** actual work is done now: add the job to the front of the queue */

			




	
	
	
		
 
  holder = geninfo->head.next;

			




	
	
	
		
 

			




	
	
	
		
 
  tmp = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); // get job number

			




	
	
	
		
 
  job_num = atoi((char*)tmp);

			




	
	
	
		
 
  xmlFree(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  job = createJobFromXML(job_num);

			




	
	
	
		
 
  job = createJobFromXML(geninfo, job_num);

			




	
	
	
		
 
  if(job == NULL)

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




	
	
	
		
 
  // insert job at front of the queue

			




	
	
	
		
 
  head->next = job;

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     insert job at front of the queue

			




	
	
	
		
 
  */

			




	
	
	
		
 
  geninfo->head.next = job;

			




	
	
	
		
 
  job->next = holder;

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* ************************** Test Functions ************************* */

			




	
	
		
 
@@ -1298,6 +1250,21 @@ int main(int argc, char *argv[])

			




	
	
	
		
 
  distrend_config_free(general_info.config);

			




	
	
	
		
 

			




	
	
	
		
 
  xmlcleanup();

			




	
	
	
		
 

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   constructs the filename for a distrenjob's serialized XML

			




	
	
	
		
 
   to be stored/retrieved from/in.

			




	
	
	
		
 
 */

			




	
	
	
		
 
char *job_getserialfilename(struct general_info *geninfo, unsigned int jobnum)

			




	
	
	
		
 
{

			




	
	
	
		
 
  char *filename;

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&filename, "%s/stor/job/%d/distrenjob.xml",

			




	
	
	
		
 
		    geninfo->config->datadir,

			




	
	
	
		
 
		    jobnum);

			




	
	
	
		
 

			




	
	
	
		
 
  return filename;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/server/distrenjob.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,12 +20,13 @@

			




	
	
	
		
 
#include "asprintf.h"

			




	
	
	
		
 
#include "distrenjob.h"

			




	
	
	
		
 
#include "slavefuncs.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <libxml/parser.h>

			




	
	
	
		
 
#include <libxml/tree.h>

			




	
	
	
		
 
#include <libxml/xmlwriter.h>

			




	
	
	
		
 

			




	
	
	
		
 
void distrenjob_free(struct distrenjob **distrenjob)

			




	
	
	
		
 
{

			




	
	
	
		
 
  struct distrenjob *dj;

			




	
	
	
		
 

			




	
	
	
		
 
  dj = *distrenjob;

			




	
	
		
 
@@ -73,13 +74,13 @@ int distrenjob_new(struct distrenjob **d

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   writes struct from xml

			




	
	
	
		
 
*/

			




	
	
	
		
 
int xml2distrenjob(struct distrenjob **distrenjob, char *pathtoxml)

			




	
	
	
		
 
int distrenjob_unserialize(struct distrenjob **distrenjob, char *pathtoxml)

			




	
	
	
		
 
{

			




	
	
	
		
 
  struct distrenjob *dj;

			




	
	
	
		
 

			




	
	
	
		
 
  xmlDocPtr xmldoc;

			




	
	
	
		
 
  xmlNodePtr xmlnode;

			




	
	
	
		
 
  xmlChar *xmlchar;

			




	
	
		
 
@@ -152,6 +153,90 @@ int xml2distrenjob(struct distrenjob **d

			




	
	
	
		
 

			




	
	
	
		
 
  xmlXPathFreeContext(xmlxpathcontext);

			




	
	
	
		
 
  xmlFreeDoc(xmldoc);

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int distrenjob_serialize(struct distrenjob *job, char *outfile)

			




	
	
	
		
 
{

			




	
	
	
		
 
  xmlTextWriterPtr writer;

			




	
	
	
		
 
  char *tmp;

			




	
	
	
		
 
  char *tmpfile;

			




	
	
	
		
 
  int tmprtn;

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     transactional FS access for POSIX systems...

			




	
	
	
		
 
     (probably not implemented correctly)

			




	
	
	
		
 
   */

			




	
	
	
		
 
  _distren_asprintf(&tmpfile, "%s_", outfile);

			




	
	
	
		
 

			




	
	
	
		
 
  /* create xml document at the location tmp with no compression */

			




	
	
	
		
 
  writer = xmlNewTextWriterFilename(tmpfile, 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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     write resolution element and add its attributes */

			




	
	
	
		
 
  xmlTextWriterStartElement(writer, (xmlChar*)"resolution");

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->width);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"width", (xmlChar*)tmp);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->height);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"height", (xmlChar*)tmp);

			




	
	
	
		
 
  free(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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  _distren_asprintf(&tmp, "%d", job->frameset[(job->total_frames - 1)].num);

			




	
	
	
		
 
  xmlTextWriterWriteAttribute(writer, (xmlChar*)"end_fame", (xmlChar*)tmp);

			




	
	
	
		
 
  free(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);

			




	
	
	
		
 
  free(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     end document */

			




	
	
	
		
 
  xmlTextWriterEndDocument(writer);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     free writer and save xml file to disk */

			




	
	
	
		
 
  xmlFreeTextWriter(writer);

			




	
	
	
		
 

			




	
	
	
		
 
  /**

			




	
	
	
		
 
     This is the key to transactioanl POSIX

			




	
	
	
		
 
     FS programming.

			




	
	
	
		
 
   */

			




	
	
	
		
 
  tmprtn = rename(tmpfile, outfile);

			




	
	
	
		
 
  if(tmprtn == -1)

			




	
	
	
		
 
    {

			




	
	
	
		
 
      fprintf(stderr, "%s:%d: Error renaming ``%s'' to ``%s''\n",

			




	
	
	
		
 
	      __FILE__, __LINE__,

			




	
	
	
		
 
	      tmpfile, outfile);

			




	
	
	
		
 
      perror("rename");

			




	
	
	
		
 
      tmprtn = 1;

			




	
	
	
		
 
    }

			




	
	
	
		
 
  free(tmpfile);

			




	
	
	
		
 

			




	
	
	
		
 
  return tmprtn;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/server/distrenjob.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -81,16 +81,25 @@ struct frameset {

			




	
	
	
		
 
/**

			




	
	
	
		
 

			




	
	
	
		
 
   @param distrenjob the address where we will store the pointer of a malloc()ed

			




	
	
	
		
 
   distrenjob struct.

			




	
	
	
		
 
   @param pathtoxml filename/pathname of the xml file to be read into a distrenjob struct

			




	
	
	
		
 
 */

			




	
	
	
		
 
int xml2distrenjob(struct distrenjob **distrenjob, char *pathtoxml);

			




	
	
	
		
 
int distrenjob_unserialize(struct distrenjob **distrenjob, char *pathtoxml);

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   support function for xml2distrenjob() to help cleaning up a

			




	
	
	
		
 
   serialize a distrenjob into XML

			




	
	
	
		
 
   @param distrenjob the address where we will store the pointer of a malloc()ed

			




	
	
	
		
 
   distrenjob struct.

			




	
	
	
		
 
   @param xmloutput filename/pathname of the xml file to be written

			




	
	
	
		
 
 */

			




	
	
	
		
 
int distrenjob_serialize(struct distrenjob *distrenjob, char *xmloutputpath);

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
   support function for distrenjob_unserialize() to help cleaning up a

			




	
	
	
		
 
   struct distrenjob when it is incompletely initialized.

			




	
	
	
		
 
   Also acts as a general-purpose struct distrenjob free()er ;-)

			




	
	
	
		
 
 */

			




	
	
	
		
 
void distrenjob_free(struct distrenjob **distrenjob);

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




        

    


    
    

    

        

                

                    src/server/slave.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -201,18 +201,18 @@ int main(int argc, char *argv[])

			




	
	
	
		
 
        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)

			




	
	
	
		
 
        if(distrenjob_unserialize(&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 */

			




	
	
	
		
 
            /* Frees things up if it was successful. distrenjob_unserialize() really (usually) only fails if malloc'ing inside it fails */

			




	
	
	
		
 
            distrenjob_free(&myjob);

			




	
	
	
		
 
          }

			




	
	
	
		
 
        else

			




	
	
	
		
 
          {

			




	
	
	
		
 
            fprintf(stderr, "XML job data parsing has failed. Please contact a developer, or try again.\n");

			




	
	
	
		
 
            return 1;

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support