DistRen Changeset - bfa4ecc86496 · protofusion repositories

Changeset - bfa4ecc86496

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

LordOfWar - 16 years ago 2009-10-14 19:45:26

a lil bit of housecleaning
mortition() is going to be changed up a bit
time took to render each from is no longer being saved

2 files changed with 1 insertions and 10 deletions:

src/server/distrend.c

src/server/distrenjob.h

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -181,11 +181,6 @@ void finish_frame(struct distrenjob *hea @@
   distrenjob->assigned_frames--;
   general_info.total_frames_rendered++; // Increase total frames var for stats
   if(distrenjob->completed_frames == distrenjob->total_frames)
+    {
       mortition(head, distrenjob);
+    }
   updateGeneralInfo();
   updateJobStatsXML(distrenjob);
+}
@@ @@ -352,7 +347,7 @@ void change_job_priority(struct distrenj @@
     // iterate through linked list of jobs
     for(current_job = head; current_job != NULL; current_job = current_job->next){
       if(current_job == NULL){ // if it has reached the end of the list, add job there
-        current_job = job;
+        prev_job->next = job;
         break;
+      }
       else if(job->priority <= current_job->priority){ // if job's priority is less than or equal to current_job's priority, insert job
@@ @@ -380,12 +375,10 @@ int find_jobframe(struct distrenjob *hea @@
     return 1;
   unsigned int frame_counter;
   short int your_job_type;
   unsigned short int found;
   struct distrenjob *distrenjob_ptr;
   your_job_type = 0;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next; distrenjob_ptr && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
@@ @@ -395,7 +388,6 @@ int find_jobframe(struct distrenjob *hea @@
       if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
+      {
     	found = 1;
     	your_job_type = distrenjob_ptr->type;
     	distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
     	distrenjob_ptr->frameset[frame_counter].start_time = clock();
     	distrenjob_ptr->assigned_frames++;

src/server/distrenjob.h

➞

Show inline comments

@@ @@ -71,7 +71,6 @@ struct frameset { @@
   char slave_name; /*< user that frame is assigned to */
   enum framesetstatus status; /*< status of frame, 0= unassigned, 1= taken, 2= done */
   clock_t start_time; /*< time the frame was started */
   int time_to_render; /*< the total seconds it took to render the frame */
 }; /* Frameset array is generated by status_report_generator() */

0 comments (0 inline, 0 general)