DistRen Changeset - 1e4bbbad6d0b · protofusion repositories

Changeset - 1e4bbbad6d0b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2010-01-23 15:39:40
ohnobinki@ohnopublishing.net

reindent + debug msg

1 file changed with 18 insertions and 14 deletions:

src/server/distrenjob.c

0 comments (0 inline, 0 general)

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -180,111 +180,115 @@ int distrenjob_unserialize(struct distre @@
       distrenjob_free(distrenjob);
       return 6;
+    }
   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);
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"end_frame", &end_frame);
   if(tmp)
+    {
       fprintf(stderr, "distrenjob_unserialize(): error reading integer values from ``%s''\n",
 	      pathtoxml);
       distrenjob_free(distrenjob);
       return 7;
+    }
   /**
      total_render_time and watchdog stuff doesn't need error
      checking, just good defaults
   */
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/stats");
   dj->total_render_time = 0;
   xmlchar = xmlGetProp(xmlnode, (xmlChar *)"total_render_time");
   if(xmlchar)
+    {
       if(strptime((char *)xmlchar, "%D %T", &tm))
 	dj->total_render_time = mktime(&tm);
       xmlFree(xmlchar);
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/watchdog");
   dj->watchdog_forgiveness = 3600;
   tmp =_distrenjob_xml_readuint(xmlnode, (xmlChar *)"forgiveness", &dj->watchdog_forgiveness);
   if(tmp)
     fprintf(stderr, "distrenjob_unserialize(): warning: watchdog forgiveness is unspecified in ``%s'', defaulting to 3600\n", pathtoxml);
   xmlXPathFreeContext(xmlxpathcontext);
   xmlFreeDoc(xmldoc);
   /**
      reconstruct the frameset
   */
   dj->total_frames = end_frame - start_frame + 1;
  dj->frameset = malloc(sizeof(struct frameset) * dj->total_frames);
  if(!dj->frameset)
+   {
      fprintf(stderr, "OOM!\n");
      distrenjob_free(distrenjob);
      return 8;
+   }
  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 */
   dj->frameset = malloc(sizeof(struct frameset) * dj->total_frames);
   if(!dj->frameset)
+    {
       fprintf(stderr, "OOM!\n");
       distrenjob_free(distrenjob);
       return 8;
+    }
   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 */
      fs ++;
+   }
       fs ++;
+    }
 #ifndef NDEBUG
   fprintf(stderr, "distrenjob_unserialize(): finished loading ``%s''\n", pathtoxml);
 #endif NDEBUG
   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);

0 comments (0 inline, 0 general)