DistRen Changeset - e696db7b7db2 · protofusion repositories

Changeset - e696db7b7db2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 16 years ago 2010-01-24 18:31:04
ohnobinki@ohnopublishing.net

fix job_list.xml, store jobnum in distrenjob.xml

2 files changed with 34 insertions and 10 deletions:

src/server/distrend.c

src/server/distrenjob.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -855,23 +855,26 @@ 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);
   _distren_asprintf(&tmp, "%s/job_list.xml",
 		    geninfo->config->datadir);
   writer = xmlNewTextWriterFilename(tmp, 0);
   free(tmp);
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   /**
      create root element job_list
   */
   xmlTextWriterStartElement(writer, (xmlChar*)"job_list");
@@ @@ -881,28 +884,28 @@ int update_xml_joblist(struct general_in @@
   free(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);
       free(tmp2);
       _distren_asprintf(&tmp, "%d", job->jobnum);
       xmlTextWriterWriteElement(writer, (xmlChar*)"jobnum", (xmlChar*)tmp);
       free(tmp);
       /**
 	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++;
+    }
   xmlTextWriterEndElement(writer);
   /**
      close elements and end document
   */
   xmlTextWriterEndDocument(writer);
   /**
@@ @@ -921,21 +924,29 @@ int createQueueFromXML(struct general_in @@
+{
   int tmp;
   xmlDocPtr doc;
   xmlNodePtr cur;
   char *xmllist_path;
   /**
      load xml document
   */
   doc = xmlParseFile("job_list.xml");
   _distren_asprintf(&xmllist_path, "%s/job_list.xml", geninfo->config->datadir);
   doc = xmlParseFile(xmllist_path);
   if(doc == NULL)
+    {
       fprintf(stderr, "createQueueFromXML: document not found\n");
       fprintf(stderr, "createQueueFromXML: ``%s'' could not be not loaded\n",
 	      xmllist_path);
       free(xmllist_path);
       return 1;
+    }
   free(xmllist_path);
   /**
      have cur point to the root element of the xml document pointed to by doc
   */
   cur = xmlDocGetRootElement(doc);
   if(cur == NULL)
@@ @@ -945,12 +956,14 @@ int createQueueFromXML(struct general_in @@
+    }
   if(xmlStrcmp(cur->name, (const xmlChar*)"job_list"))
+    {
       fprintf(stderr, "createQueueFromXML: incorrect root element (%s)", (char*)cur->name);
+    }
   else
     fprintf(stderr, "USING %s\n", cur->name);
   /**
      moves into the children elements of job_list
   */
   cur = cur->xmlChildrenNode;

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -189,12 +189,20 @@ int distrenjob_unserialize(struct distre @@
+    {
       distrenjob_free(distrenjob);
       return 6;
+    }
   tmp = _distrenjob_xml_readuint(xmlnode, (xmlChar *)"jobnum", &dj->jobnum);
   if(tmp)
+    {
       distrenjob_free(distrenjob);
       return 7;
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/resolution");
   tmp = _distrenjob_xml_readuint(xmlnode, (xmlChar *)"width"   , &dj->width   );
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"height"  , &dj->height  );
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/video");
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"start_frame", &start_frame);
@@ @@ -202,13 +210,13 @@ int distrenjob_unserialize(struct distre @@
   if(tmp)
+    {
       fprintf(stderr, "distrenjob_unserialize(): error reading integer values from ``%s''\n",
 	      pathtoxml);
       distrenjob_free(distrenjob);
-      return 7;
+      return 8;
+    }
   /**
      total_render_time and watchdog stuff doesn't need error
      checking, just good defaults
   */
@@ @@ -240,13 +248,13 @@ int distrenjob_unserialize(struct distre @@
 #endif
   dj->frameset = malloc(sizeof(struct frameset) * dj->total_frames);
   if(!dj->frameset)
+    {
       fprintf(stderr, "OOM!\n");
       distrenjob_free(distrenjob);
-      return 8;
+      return 9;
+    }
   fs = dj->frameset;
   for(counter = start_frame; counter <= end_frame; counter ++)
+    {
       fs->num = counter;
       fs->status = FRAMESETSTATUS_UNASSIGNED; /*< @todo job partial completion and resumption support */
@@ @@ -283,12 +291,15 @@ int distrenjob_serialize(struct distrenj @@
   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);
   _distren_asprintf(&tmp, "%d", job->jobnum);
   xmlTextWriterWriteAttribute(writer, (xmlChar *)"jobnum", (xmlChar *)tmp);
   free(tmp);
   xmlTextWriterWriteAttribute(writer, (xmlChar *)"output_format", (xmlChar *)job->output_format);
   /**
      write resolution element and add its attributes */
   xmlTextWriterStartElement(writer, (xmlChar*)"resolution");

0 comments (0 inline, 0 general)