DistRen Changeset - 64aa85927a9d · protofusion repositories

Changeset - 64aa85927a9d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

more debug messages

2 files changed with 14 insertions and 4 deletions:

src/server/distrend.c

src/server/distrenjob.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -788,26 +788,29 @@ int import_general_info(struct general_i @@
    calls distrenjob_unserialize()
  */
 int restore_distrenjob(struct general_info *geninfo, struct distrenjob **distrenjob, jobnum_t jobnum)
+{
   int tmp;
   char *file_name;
   tmp = job_getserialfilename(&file_name, geninfo, jobnum, 0);
   if(tmp)
     return tmp;
   tmp = distrenjob_unserialize(distrenjob, file_name);
   if(tmp)
     fprintf(stderr, "failed to load job %d from ``%s''\n",
 	    jobnum, file_name);
   free(file_name);
   return tmp;
+}
 int updateJobStatsXML(struct distrenjob *job)
+{
 	  xmlTextWriterPtr writer;
 	  char *tmp;
 	  _distren_asprintf(&tmp, "stor/job%d/stats.xml", job->jobnum);
 	  /**
 	     create xml document at the location tmp with no compression

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -79,26 +79,30 @@ int distrenjob_new(struct distrenjob **d @@
    @param xmlnode may be NULL for convenience
    @return 0 on success, other on error
  */
 int _distrenjob_xml_readuint(xmlNodePtr xmlnode, xmlChar *propname, unsigned int *num)
+{
   xmlChar *string;
   if(!xmlnode)
     return 1;
   string = xmlGetProp(xmlnode, propname);
   if(!string)
     return 1;
+    {
       fprintf(stderr, "_distrenjob_xml_readuint(): warning: unable to get property ``%s''\n",
 	      propname);
       return 1;
+    }
   *num = (unsigned int)strtoul((char *)string, (char **)NULL, 10);
 #ifndef NDEBUG
   fprintf(stderr, "_distrenjob_xml_readuint(%zx, \"%s\", *(%zx)=%u): read %s=\"%d\"\n",
 	  (size_t)xmlnode, propname, (size_t)num, *num, propname, *num);
 #endif
   xmlFree(string);
   return 0;
+}
 /**
    Loads a distrenjob that was serialized with distrenjob_serialize()
@@ @@ -212,47 +216,50 @@ int distrenjob_unserialize(struct distre @@
       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);
 #ifndef NDEBUG
   fprintf(stderr, "distrenjob_unserialize(): restoring %d frames\n", dj->total_frames);
 #endif
   /**
      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 */
       fs ++;
+    }
 #ifndef NDEBUG
   fprintf(stderr, "distrenjob_unserialize(): finished loading ``%s''\n", pathtoxml);
-#endif NDEBUG
 #endif
   return 0;
+}
 int distrenjob_serialize(struct distrenjob *job, char *outfile)
+{
   xmlTextWriterPtr writer;
   char *tmp;
   char *tmpfile;
   int tmprtn;
   /**

0 comments (0 inline, 0 general)