DistRen Changeset - 5dc296ca954f · protofusion repositories

Changeset - 5dc296ca954f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-12-20 16:41:24
ohnobinki@ohnopublishing.net

fix return vals, free() after _distren_asprintf()

1 file changed with 66 insertions and 18 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -731,18 +731,25 @@ void update_general_info(struct general_ @@
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   xmlTextWriterStartElement(writer, (xmlChar*)"general_info");
   _distren_asprintf(&tmp, "%d", geninfo->jobs_in_queue);
   xmlTextWriterWriteElement(writer, (xmlChar*)"jobs_in_queue", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", geninfo->total_finished_jobs);
   xmlTextWriterWriteElement(writer, (xmlChar*)"total_finished_jobs", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", geninfo->total_frames_rendered);
   xmlTextWriterWriteElement(writer, (xmlChar*)"total_frames_rendered", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", geninfo->highest_jobnum);
   xmlTextWriterWriteElement(writer, (xmlChar*)"highest_jobnum", (xmlChar*)tmp);
   free(tmp);
   xmlTextWriterEndDocument(writer);
   xmlFreeTextWriter(writer);
+}
 // this reads the information from general_info.xml to the general_info structure
@@ @@ -823,12 +830,13 @@ struct distrenjob *createJobFromXML(stru @@
   xmlFreeDoc(doc);
   /** load up stats.xml file to retrieve data */
   _distren_asprintf(&file_name, "stor/job%d/stats.xml", jobnum);
   doc = xmlParseFile(file_name);
   free(file_name);
   cur = xmlDocGetRootElement(doc);
   distrenjob->total_render_time = (time_t)atol((char*)xmlGetProp(cur, (xmlChar*)"total_render_time"));
   xmlFreeDoc(doc);
@@ @@ -847,120 +855,156 @@ struct distrenjob *createJobFromXML(stru @@
   return distrenjob;
+}
 int updateJobStatsXML(struct distrenjob *job)
+{
 	  xmlTextWriterPtr writer;
-	  char *tmp; // temporarily holds strings to be given to the xml writer
 	  char *tmp;
 	  _distren_asprintf(&tmp, "stor/job%d/stats.xml", job->jobnum);
 	  // create xml document at the location tmp with no compression
 	  /**
 	     create xml document at the location tmp with no compression
 	  */
 	  writer = xmlNewTextWriterFilename(tmp, 0);
 	  free(tmp);
 	  xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
 	  xmlTextWriterStartElement(writer, (xmlChar*)"stats");
 	  _distren_asprintf(&tmp, "%d", job->assigned_frames);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"assigned_frames", (xmlChar*)tmp);
 	  free(tmp);
 	  _distren_asprintf(&tmp, "%d", job->completed_frames);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"completed_frames", (xmlChar*)tmp);
 	  free(tmp);
 	  _distren_asprintf(&tmp, "%d", job->total_render_time);
 	  xmlTextWriterWriteAttribute(writer, (xmlChar*)"total_render_time", (xmlChar*)tmp);
 	  free(tmp);
 	  // end document
 	  /**
 	     end document
 	  */
 	  xmlTextWriterEndDocument(writer);
 	  // free writer and save xml file to disk
 	  /**
 	     free writer and save xml file to disk
 	     @TODO confirma that calling xmlFreeTextWriter calls
 	           write() and close(), respectively.
 		   (close() causes asynchronous writes to be
 		   completed).
 	  */
 	  xmlFreeTextWriter(writer);
 	  return 1;
+}
 // returns 1 if successful
 // updates job_list.xml which lists all the jobs in the queue
 /**
    updates job_list.xml which lists all the jobs in the queue
    @return 0 means success
 */
 int update_xml_joblist(struct general_info *geninfo)
+{
   struct distrenjob *job;
   xmlTextWriterPtr writer;
   char *tmp;
   char *tmp2;
   int counter;
   // update timestamp
   /**
      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
   /**
      create root element job_list
   */
   xmlTextWriterStartElement(writer, (xmlChar*)"job_list");
   _distren_asprintf(&tmp, "%d", geninfo->timestamp);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"timestamp", (xmlChar*)tmp);
   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);
       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++;
+    }
   // close elements and end document
   /**
      close elements and end document
   */
   xmlTextWriterEndDocument(writer);
   // free writer and save xml file to disk
   /**
      free writer and save xml file to disk
   */
   xmlFreeTextWriter(writer);
-  return 1;
+  return 0;
+}
 /**
  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 general_info *geninfo)
+{
   int tmp;
   xmlDocPtr doc;  // holds xml document in memory
   xmlNodePtr cur; // points to the current xml element node
   xmlDocPtr doc;
   xmlNodePtr cur;
   // load xml document
   /**
      load xml document
   */
   doc = xmlParseFile("job_list.xml");
   if(doc == NULL)
+    {
       fprintf(stderr, "createQueueFromXML: document not found\n");
       return 1;
+    }
   // have cur point to the root element of the xml document pointed to by doc
   /**
      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 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
   /**
      moves into the children elements of job_list
   */
   cur = cur->xmlChildrenNode;
   tmp = reCreateQueueFromXML(geninfo, doc, cur);
   xmlFreeDoc(doc);
@@ @@ -1033,14 +1077,15 @@ int printFrameInfo(struct frameset *fram @@
       break;
     case FRAMESETSTATUS_CANCELED:
       _distren_asprintf(&status, "%s", "canceled");
+  }
   printf("frame #: %d --> %s\n", frame->num, status);
   free(status);
-  return 1;
+  return 0;
+}
 int printJob(struct distrenjob *job)
+{
   int counter;
   fprintf(stderr, "frame_num: status\n");
@@ @@ -1278,12 +1323,15 @@ int main(int argc, char *argv[]) @@
   return 0;
+}
 /**
    constructs the filename for a distrenjob's serialized XML
    to be stored/retrieved from/in.
    @return pointer to filename allocated using something
            malloc() and free() compatible. Must be free()ed by the
 	   caller
  */
 char *job_getserialfilename(struct general_info *geninfo, unsigned int jobnum)
+{
   char *filename;
   _distren_asprintf(&filename, "%s/stor/job/%d/distrenjob.xml",

0 comments (0 inline, 0 general)