DistRen Changeset - 6a550a53b903 · protofusion repositories

Changeset - 6a550a53b903

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-13 22:01:38

updated createJobFromXML()

1 file changed with 12 insertions and 10 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -267,13 +267,13 @@ int prepare_distrenjob(struct distrenjob @@
       distrenjob_free(&distrenjob);
       return 1;
+    }
   /* prepares all the frames by setting that status to "unassigned" */
   counter2 = start_frame;
-  for(counter = 0; counter <= (end_frame- start_frame + 1); counter++){
+  for(counter = 0; counter <= distrenjob->total_frames; counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
     counter2++;
+  }
@@ @@ -649,21 +649,12 @@ struct distrenjob *createJobFromXML(int @@
   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));
   xmlFreeDoc(doc);
   // load up stats.xml file to retrieve data
@@ @@ -673,12 +664,23 @@ struct distrenjob *createJobFromXML(int @@
   cur = xmlDocGetRootElement(doc);
   distrenjob->total_render_time = (time_t)atol((char*)xmlGetProp(cur, (xmlChar*)"total_render_time"));
   xmlFreeDoc(doc);
   distrenjob->frameset = malloc(sizeof(struct frameset) * distrenjob->total_frames);
   // change the status of all frames to "unassigned"
   counter2 = start_frame;
   for(counter = 0; counter <= (end_frame- start_frame + 1); counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
     counter2++;
+  }
   restoreJobState(distrenjob);
   return distrenjob;
+}
 int updateJobStatsXML(struct distrenjob *job)
+{

0 comments (0 inline, 0 general)