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

@@ @@ -178,17 +178,12 @@ void finish_frame(struct distrenjob *hea @@
   distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
   distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob[jobnum].frameset[frame].start_time);
   distrenjob->completed_frames++;
   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);
+}
 /** "mortition" check to see if a job is actually done by scanning the folder of the job to make sure all frames are present*/
 void mortition(struct distrenjob *head, struct distrenjob *job)
@@ @@ -349,13 +344,13 @@ void change_job_priority(struct distrenj @@
     /* if job was not yet started */
     distrenjob_enqueue(head, job);
   else{ // if job has already been started, place it before the jobs with the same priority
     // 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
         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;
@@ @@ -377,28 +372,25 @@ void change_job_priority(struct distrenj @@
 int find_jobframe(struct distrenjob *head, struct distrenjob **job, struct frameset **frame)
+{
   if(general_info.hibernate)
     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)
+  {
     for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
+    {
       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++;
     	distrenjob_ptr->prev_frame_index = frame_counter;
     	updateJobStatsXML(distrenjob_ptr);
+      }

src/server/distrenjob.h

➞

Show inline comments

@@ @@ -68,13 +68,12 @@ enum framesetstatus @@
 struct frameset {
   int num; /*< frame number to render */
   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() */
 /*
 related functions
 */

0 comments (0 inline, 0 general)