DistRen Changeset - a8d7b5c12020 · protofusion repositories

Changeset - a8d7b5c12020

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-09 22:37:54

makeJobDataXML now stores more data in the xml file and createJobFromXML() has been updated to read it all and create the job.

1 file changed with 41 insertions and 1 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -550,13 +550,13 @@ int makeJobDataXML(struct distrenjob *jo @@
   _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 resolution element and add its attributes
+  // write distrenjob element and add its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"distrenjob");
   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);
@@ @@ -565,12 +565,29 @@ int makeJobDataXML(struct distrenjob *jo @@
   _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);
   // write total_render_time element
   _distren_asprintf(&tmp, "%d", job->total_render_time);
   xmlTextWriterWriteElement(writer, (xmlChar*)"total_render_time", (xmlChar*)tmp);
   // end document
   xmlTextWriterEndDocument(writer);
   // free writer and save xml file to disk
   xmlFreeTextWriter(writer);
@@ @@ -582,12 +599,15 @@ int makeJobDataXML(struct distrenjob *jo @@
 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);
@@ @@ -598,12 +618,32 @@ struct distrenjob *createJobFromXML(int @@
   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");
   counter2 = start_frame;
   for(counter = 0; counter <= distrenjob->total_frames; counter++)
+    {
       distrenjob->frameset[counter].num = counter2;
       distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
       counter2++;
+    }
   cur = cur->next;
   distrenjob->watchdog_forgiveness = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   cur = cur->next;
   distrenjob->total_render_time = (time_t)atol((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   restoreJobState(distrenjob);
   return distrenjob;
+}
 // returns 1 if successful
 // updates job_list.xml which lists all the jobs in the queue

0 comments (0 inline, 0 general)