Changeset - 4b53912fd49c
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Nathan Brink (binki) - 16 years ago 2009-12-01 00:23:47
ohnobinki@ohnopublishing.net
createQueueFromXML(): slight cleanup, error handling
1 file changed with 24 insertions and 24 deletions:
src/server/distrend.c
24
24
0 comments (0 inline, 0 general)
src/server/distrend.c
➞
Show inline comments
 
@@ -751,101 +751,104 @@ int makeJobDataXML(struct distrenjob *jo
 
  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);

			




	
	
	
		
 
  if(!doc)

			




	
	
	
		
 
    return NULL;

			




	
	
	
		
 

			




	
	
	
		
 
  distrenjob_new(&distrenjob);

			




	
	
	
		
 

			




	
	
	
		
 
  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;

			




	
	
		
 
@@ -878,173 +881,170 @@ int updateJobStatsXML(struct distrenjob 

			




	
	
	
		
 
int update_xml_joblist(struct general_info *geninfo)

			




	
	
	
		
 
{

			




	
	
	
		
 
  struct distrenjob *job;

			




	
	
	
		
 
  xmlTextWriterPtr writer;

			




	
	
	
		
 
  char *tmp;

			




	
	
	
		
 
  char *tmp2;

			




	
	
	
		
 
  int counter;

			




	
	
	
		
 

			




	
	
	
		
 
  // update timestamp

			




	
	
	
		
 
  geninfo->timestamp ++;

			




	
	
	
		
 
  if(geninfo->timestamp > 65530)

			




	
	
	
		
 
    geninfo->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", geninfo->timestamp);

			




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

			




	
	
	
		
 

			




	
	
	
		
 
  geninfo->total_priority_pieces = 0;

			




	
	
	
		
 
  counter = 0;

			




	
	
	
		
 
  for(job = geninfo->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 

			




	
	
	
		
 
      

			




	
	
	
		
 
	Why the random constant numeral 11? --ohnobinki

			




	
	
	
		
 
      */

			




	
	
	
		
 
      geninfo->total_priority_pieces = geninfo->total_priority_pieces + (NUMBER_ELEVEN - 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

			




	
	
	
		
 
/**

			




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

			




	
	
	
		
 

			




	
	
	
		
 
  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;

			




	
	
	
		
 
      return 1;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




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

			




	
	
	
		
 
      return 1;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
  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

			




	
	
	
		
 
    }*/

			




	
	
	
		
 
  tmp = reCreateQueueFromXML(head, doc, cur);

			




	
	
	
		
 

			




	
	
	
		
 
  xmlFreeDoc(doc);

			




	
	
	
		
 

			




	
	
	
		
 
  return 1;

			




	
	
	
		
 
  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)

			




	
	
	
		
 
{

			




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

			




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

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




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

			




	
	
	
		
 
  xmlFree(tmp);

			




	
	
	
		
 

			




	
	
	
		
 
  job = createJobFromXML(job_num);

			




	
	
	
		
 
  xmlFree(tmp); // free xml char (that holds the job number)

			




	
	
	
		
 
  if(job == NULL)

			




	
	
	
		
 
    return 1;

			




	
	
	
		
 

			




	
	
	
		
 
  // insert job at front of the queue

			




	
	
	
		
 
  head->next = job;

			




	
	
	
		
 
  job->next = holder;

			




	
	
	
		
 

			




	
	
	
		
 
  return 1;

			




	
	
	
		
 
  return 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




        

    



    


    



    



      

      





    
    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