DistRen Changeset - 093a01362862 · protofusion repositories

Changeset - 093a01362862

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-09-17 16:50:34
ohnobinki@ohnopublishing.net

find_jobframe() cleanup

1 file changed with 2 insertions and 7 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -268,83 +268,78 @@ void change_job_priority(struct distrenj @@
         break;
+      }
       else if(job->priority <= current_job->priority){ // if job's priority is less than or equal to current_job's priority, insert job
         prev_job->next = job;                        // keep in mind 1 is the highest priority given to jobs, head has a
         job->next = current_job;                     // priority of zero so it will always be before other jobs
         break;
+      }
       prev_job = current_job;
+    }
+  }
+}
 /**
   Frame Finder: matches your computer up with a lovely frame to render
   TODO: Major issue here, the client needs to know the frame number, AND the job number!
   Notice that this function starts by looking at the oldest job first
 	TODO: Link this up with the main() function to check if there are frames available or not and provide jobnum/framenum to the client
   @return 0 success, other: error
 */
 int find_jobframe(struct distrenjob *head, struct distrenjob **job, struct frameset **frame)
+{
   int frame_counter;
+  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; !found && !distrenjob_ptr; distrenjob_ptr = distrenjob_ptr->next)
     for(frame_counter = 0; !found && frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
       if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED)
+	{
 	  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++;
+	}
   // end of while statement... job must be found or linked list must be ended to get out of here
   if(!found)
+    {
       fprintf(stderr, "No more jobs to render\n");
       sleep(1); /*< @todo eliminate the need for this line*/
       return 1;
+    }
   // the actual frame number to be rendered by the client is start_frame + your_frame
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
   /* should the job be removed now? ANSWER: well, if a computer decides not to return their frame then we lost our data... so its not done yet. */
   fprintf(stderr, "Job %d is finished, this is probably the place to call the job-removal function\n", distrenjob_ptr->jobnum);
   /* @TODO: At this point, all slaves should be instructed to delete the source data for this job. */
   return 0;
+}
 /** Checks for dead, laggy, or stale slaves */
 void blend_frame_watchdog(struct distrenjob *distrenjob_head)
+{
   unsigned short int watchdog_forgiveness; /*< seconds to wait on a frame before re-assigning it */
   struct distrenjob *distrenjob_ptr;
   unsigned int counter;
   watchdog_forgiveness = 1; /*< hours of forgiveness before frame is re-assigned @TODO: Make this more user-configurable (maybe per-job), 3 hours is a LONG time */
   distrenjob_ptr = distrenjob_head;
   for(distrenjob_ptr = distrenjob_head; distrenjob_ptr; distrenjob_ptr = distrenjob_ptr->next)
     /* iterate through jobs */
     for(counter = 0; counter < distrenjob_ptr->total_frames; counter ++)
       /* iterate through all frames for this job*/
+      {
         if((distrenjob_ptr->frameset[counter].start_time + (watchdog_forgiveness * 3600)) < clock())
           /*
             If frame is not completed within the number of hours specified by watchdog_forgiveness
             Then change the frame status to unassigned
            */

0 comments (0 inline, 0 general)