DistRen Changeset - 5b97ab8e1501 · protofusion repositories

Changeset - 5b97ab8e1501

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-25 15:03:03

added some more code to the smarter frame finder, and indented some code

1 file changed with 18 insertions and 11 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -473,39 +473,42 @@ int find_jobframe_new(struct distrenjob @@
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next;
   distrenjob_ptr && !distrenjob_ptr->hibernate && distrenjob_ptr->prev_frame_index < distrenjob_ptr->total_frames;
   distrenjob_ptr = distrenjob_ptr->next)
+  {
 	  power_difference = (general_info.total_render_power / general_info.total_priority_pieces)*distrenjob_ptr->priority;
+	  power_difference = (general_info.total_render_power / general_info.total_priority_pieces)*(11-distrenjob_ptr->priority);
 	  power_difference = power_difference - distrenjob_ptr->assigned_render_power;
 	  if(power_difference > greatest_power_difference)
+	  {
 		  job_to_render = distrenjob_ptr;
 		  greatest_power_difference = power_difference;
 		  found = 1;
+	  }
+  }
   find_jobframe_from_job(job_to_render, job, frame);
   if(!found)
+    {
       fprintf(stderr, "No more jobs to render\n");
       sleep(1); /*< @todo eliminate the need for this line*/
       return 1;
+    }
   find_jobframe_from_job(job_to_render, job, frame);
   job_to_render->assigned_render_power = job_to_render->assigned_render_power + rend_pwr;
   return 0;
+}
 // gets a frame to render from the same job that the previously rendered frame was from
 int find_jobframe_again(struct distrenjob *head, int jobnum, int rend_pwr, struct distrenjob **job, struct frameset **frame)
+{
   if(general_info.hibernate)
     return 1;
   short int found;
   struct distrenjob *distrenjob_ptr;
   distrenjob_ptr = distrenjob_get(head, jobnum);
   if(!distrenjob_ptr)
@@ @@ -700,12 +703,14 @@ void importGeneralInfo() @@
   general_info.highest_jobnum = atoi((char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
   general_info.hibernate = 0;
   general_info.free_clients = 0;
   general_info.rendering_clients = 0;
   general_info.timestamp = 0;
   general_info.total_render_power = 0;
   general_info.total_priority_pieces = 0;
   xmlFreeDoc(doc);
+}
 // returns 1 on successful completion of xml file
 // creates the xml file that slaves read from, and is used to restart distren
@@ @@ -1070,12 +1075,14 @@ int main(int argc, char *argv[]) @@
   general_info.rendering_clients = 0;
   general_info.total_finished_jobs = 0;
   general_info.total_frames_rendered = 0;
   general_info.highest_jobnum = 0;
   general_info.hibernate = 0;
   general_info.timestamp = 0;
   general_info.total_render_power = 0;
   general_info.total_priority_pieces = 0;
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;
   struct frameset *tmp_frame;
   int type;
@@ @@ -1094,22 +1101,22 @@ int main(int argc, char *argv[]) @@
   xmlinit();
   test = 0;
   for(counter = 0; counter < argc; counter ++)
+    {
       if(strcmp(argv[counter], "-h") == 0)
+	{
 	  fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
 	  return 2;
+	}
+      {
     	  fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
 		  return 2;
+      }
       else if(strcmp(argv[counter], "-t") == 0)
+	{
 	  fprintf(stderr, "Entering into test mode...\n\n");
 	  test=1;
+	}
+      {
     	  fprintf(stderr, "Entering into test mode...\n\n");
 		  test=1;
+      }
+    }
   cont = 1;
   memset(&head, '\0', sizeof(struct distrenjob));
   distrend_do_config(argc, argv, &config);

0 comments (0 inline, 0 general)