DistRen Changeset - 9a584f11d162 · protofusion repositories

Changeset - 9a584f11d162

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-07-15 13:16:53
ohnobinki@ohnopublishing.net

added and integrated blendjob_remove()

1 file changed with 41 insertions and 4 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -28,27 +28,29 @@ @@
 #include "execio.h"
 #include "options.h"
 #include <confuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h> /* getopt */
 #include <time.h>
 /* internally defined funcs */
 /*
   internally defined funcs's prototypes
 */
 void status_report_generator();
+void blendjob_remove(struct blendjob **head, struct blendjob *bj);
 // Global Vars, try to cut down on these
 int jobnum = 0; // The next job number to create in the queue
 int hcfjob; // Highest consecutively finished job
 int highest_jobnum; // The job number of the most recently created job, this is used when creating new jobs
 /* ******************* Structs ************************ */
 // Stores config info? editmycomment
 struct distrend_config
+{
   cfg_t *mycfg;
@@ @@ -143,32 +145,34 @@ void queue(struct blendjob *blendjob, in @@
     blendjob->priority = priority;
     blendjob->frameset = frameset;
+  }
   else{
     // Throw error.
+  }
 jobnum++; // Advance the jobnumber for the next queued job
+}
 /*
   Status Report Generator: figures out how much of the job is done, where jobnum corresponds to the job number
   blendjobs_head is a pointer to a pointer because the head of the blendjobs linked list may need to be changed by blendjob_remove
 */
 void status_report_generator(struct blendjob *blendjobs_head)
+void status_report_generator(struct blendjob **blendjobs_head)
+{
   struct blendjob *blendjob_ptr;
   unsigned short workers_working; /*< used to count the total number of workers working */
   unsigned int numjobs; /*< used to track number of jobs */
   blendjob_ptr = blendjobs_head;
+  blendjob_ptr = *blendjobs_head;
   workers_working = 0;
   numjobs = 0;
   while(blendjob_ptr)
+    {
       if(blendjob_ptr->priority != 0)
 	/* If the job is not done, scan it */
+	{
 	  unsigned int framecounter;  /*< to scan through frames */
 	  unsigned long finished_frames; /*< variable that counts the completed frames */
 	  unsigned int pending_frames; /*< variable that counts the assigned frames */
 	  float percent_frames_finished;  /*< variable that stores the percent done of the blendjob */
@@ @@ -205,24 +209,25 @@ void status_report_generator(struct blen @@
 	  /* updates values in the blendjob struct */
 	  blendjob_ptr->completed_frames = finished_frames;
 	  blendjob_ptr->assigned_frames = pending_frames;
 	  blendjob_ptr->percent_done = percent_frames_finished;
 	  blendjob_ptr->avg_render_time = (total_time / finished_frames); /*< extraneous parentheses! */
 	  blendjob_ptr->time_remaining = (blendjob_ptr->avg_render_time * (blendjob_ptr->total_frames - finished_frames)); /*< extraneous parentheses! */
 	  if(finished_frames == blendjob_ptr->total_frames)
 	    /* If all frames are complete */
+	    {
 	      blendjob_ptr->priority = 0; /*< set priority to zero to indicate job is complete */
 	      blendjob_remove(blendjobs_head, blendjob_ptr); /*< remove this job from the linkedlist */
 	      general_info.total_finished_jobs++; /*< add one to the total finished jobs */
+	    }
 	  else if (finished_frames > blendjob_ptr->total_frames)
 	    /* just in case ;-) */
+	    {
 	      fprintf(stderr, "%s:%d: finished_frames (%lu) > blendjob_ptr->total_frames (%d)",
 		      __FILE__, __LINE__,
 		      finished_frames,
 		      blendjob_ptr->total_frames);
 	      abort();
+	    }
@@ @@ -324,24 +329,56 @@ void blend_frame_watchdog(struct blendjo @@
       /* iterate through all frames for this job*/
+      {
 	if((blendjob_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
 	  */
 	  blendjob_ptr->frameset[counter].frame_status = 0;
+      }
+}
 /**
    Removes a blendjob from the blendjob linkelist.
    @arg head a double pointer. the head pointer will have to be changed if blendjob == *head. Thus, make sure that the pointer points to the pointer to the head that all functions use. (I'm going to come back to this and misunderstand myself ;-))
  */
 void blendjob_remove(struct blendjob **head, struct blendjob *bj)
+{
   struct blendjob *previous_blendjob;
   if(bj == *head)
     *head = bj->next;
   else
+    {
       for(previous_blendjob = *head;
 	  previous_blendjob
 	    && previous_blendjob->next != bj; /*< stop on the blendjob that comes before bj */
 	  previous_blendjob = previous_blendjob->next)
 	/* all of the action is in the definition of the for loop itself */;
       /*
 	This removes references to bj from the linked list. I.E., we now skip bj when iterating through the list
        */
       previous_blendjob->next = bj->next;
+    }
   /*
      @lordofwar: the magic deallocation of memory ;-)
    */
   free(bj);
+}
 /* ************************** Main ************************* */
 int main(int argc, char *argv[])
+{
 //// Begin Getopt Sample, EDITME!Sometime
 		   int aflag = 0;
 	       int bflag = 0;
 	       char *cvalue = NULL;
 	       int index;
 	       int c;

0 comments (0 inline, 0 general)