DistRen Changeset - 8e1f4a09cd93 · protofusion repositories

Changeset - 8e1f4a09cd93

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-09-15 01:54:48

-Deleted status_report_generator
-Need to talk about what variables we really need in distrenjob
-Updated comments about distrenjob_enqueue

1 file changed with 3 insertions and 94 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -129,368 +129,277 @@ void distrend_unlisten() @@
 */
 void remotio_send_to_client()
+{
 	// I am futile!
+}
 /** Fill variables after crash / shutdown from XML dumps */
 int start_data(){
   struct stat buffer;
   if(stat(SYSCONFDIR "/data.xml", &buffer) == 0){
     // @TODO: retrieve total_finished_jobs and total_finished_frames from xml file
     fprintf(stderr,"Parsing XML files and restoring previous state...\n");
     return 1;
+  }
   else{
     general_info.total_finished_jobs = 0;
     general_info.total_frames_rendered = 0;
     fprintf(stderr,"Can't find XML dump, starting up fresh.\n");
     return 2;
+  }
   free(&buffer); // @TODO: Is this pointless?
+}
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 void finish_frame(struct distrenjob *distrenjob, int frame){
   distrenjob->frameset[frame].status = 2;
   distrenjob->frameset[frame].time_to_render = (clock() - distrenjob[jobnum].frameset[frame].start_time); // Consider changing time-to-render to time-for-frame or something?
   distrenjob->avg_render_time = ((distrenjob->avg_render_time*(distrenjob->completed_frames - 1)) + distrenjob->frameset[frame].time_to_render)/distrenjob->completed_frames;
   distrenjob->completed_frames++;
   general_info.total_frames_rendered++; // Increase total frames var for stats
+}
 /**
    creates a structure from starting data, then calls another function to actually add that struct to the queue
 */
 void prepare_distrenjob(struct frameset *head, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame)
+{
   int counter2;
   int counter;
   struct distrenjob *distrenjob;
   distrenjob->type = 1;
   distrenjob->name = name;
   distrenjob->submitter = submitter;
   distrenjob->email = email;
   distrenjob->priority = priority;
   distrenjob->frameset = malloc(end_frame - start_frame + 1);
   distrenjob->total_frames = (end_frame - start_frame + 1); // sets the total number of frames in animation for status purposes
   /* @TODO: what does this do? frameset array is declared above */
   /*
   distrenjob->frameset = malloc(sizeof(struct frameset) * numframes);
   if(!job->frameset)
     fprintf(stderr, "Error allocating memory\n");
   */
   /* prepares all the frames by setting that status to "unassigned" */
   counter2 = start_frame;
   for(counter = 0; counter <= (end_frame- start_frame + 1); counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = 0;
     counter2++;
+  }
   /* @TODO: change frame_num_struct_builder to add_blendjob_to_queue */
   distrenjob_enqueue(head, distrenjob);
   general_info.jobs_in_queue++;
+}
 /** -- OLD -- Queuer: Adds files to the queue
 int queue(struct distrenjob *distrenjob, int type, char *name, char *submitter, char *email, int priority, int mode, int spp, struct frameset *frameset) {
   // Type: 1 = blender, add more types later
   // jobnum is the next available job number
   if(type == 1){
     distrenjob->name = name;
     distrenjob->submitter = submitter;
     distrenjob->email = email;
     distrenjob->priority = priority;
     distrenjob->frameset = frameset;
+  }
   else{
     // Throw error.
     fprintf(stderr,"You tried to queue a job type that isn't supported by this version of DistRen.\nI have no idea how this would happen, but it just did.\n");
     return 0; // fail
+  }
 jobnum++; // Advance the jobnumber for the next queued job
 return 0; // OK
 }*/
 /**
   Status Report Generator:
   -figures out how much of the job is done, where jobnum corresponds to the job number
   -removes finished jobs
   @param distrenjobs_head a pointer to a pointer because the head of the distrenjobs linked list may need to be changed by distrenjob_remove
 */
 void status_report_generator(struct distrenjob **distrenjobs_head)
+{
   struct distrenjob *distrenjob_ptr;
   unsigned short workers_working; /*< used to count the total number of workers working */
   unsigned int numjobs; /*< used to track number of jobs */
   workers_working = 0; /*@TODO is there another way to trade how many workers are working, this is equal to assigned frames*/
   numjobs = 0;
   for(distrenjob_ptr = *distrenjobs_head; distrenjob_ptr; distrenjob_ptr = distrenjob_ptr->next)
+    {
       if(distrenjob_ptr->frameset[0].status == 0 && distrenjob_ptr->frameset[1].status == 0)
 	/* If the job has been started, 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 distrenjob */
 	  unsigned int total_time;  /*< total time taken to render all the completed frames for a job */
 	  framecounter = 0;
 	  finished_frames = 0;
 	  pending_frames = 0;
 	  percent_frames_finished = 0;
 	  total_time = 0;
 	  while(framecounter < distrenjob_ptr->total_frames)
 	    /* scans through frames, based on their status it runs a statement(s) */
+	    {
 	      if(distrenjob_ptr->frameset[framecounter].status == 2)
 		/* If the frame is done */
+		{
 		  finished_frames ++;
+		}
 	      if(distrenjob_ptr->frameset[framecounter].status == 1)
 		/* If the frame is assigned */
+		{
 		  pending_frames ++;
 		  workers_working ++;
+		}
 	      framecounter ++;
 	    } /* while(framecounter < distrenjob_ptr->total_frames) */
 	  // find the percent of completed frames
 	  percent_frames_finished = (finished_frames / distrenjob_ptr->total_frames) * 100; /*< @LordofWar: extraneous parentheses! */
 	  /* updates values in the distrenjob struct */
 	  distrenjob_ptr->completed_frames = finished_frames;
 	  distrenjob_ptr->assigned_frames = pending_frames;
 	  distrenjob_ptr->percent_done = percent_frames_finished;
 	  distrenjob_ptr->time_remaining = (distrenjob_ptr->avg_render_time * (distrenjob_ptr->total_frames - finished_frames)); /*< extraneous parentheses! */
 	  if(finished_frames == distrenjob_ptr->total_frames)
 	    /* If all frames are complete */
+	    {
 	      distrenjob_remove(distrenjobs_head, distrenjob_ptr); /*< remove this job from the linkedlist */
 	      distrenjob_free(distrenjob_ptr);
 	      general_info.total_finished_jobs++; /*< add one to the total finished jobs */
+	    }
 	  else if (finished_frames > distrenjob_ptr->total_frames)
 	    /* just in case ;-) */
+	    {
 	      fprintf(stderr, "%s:%d: finished_frames (%lu) > distrenjob_ptr->total_frames (%d)",
 		      __FILE__, __LINE__,
 		      finished_frames,
 		      distrenjob_ptr->total_frames);
 	      abort();
+	    }
+	}
       general_info.rendering_clients = workers_working; /*< should this be a +=? */
       numjobs ++;
     } /* while(distrenjob_ptr) */
   general_info.jobs_in_queue = numjobs;
+}
 /**
    Structure Builder: This function creates frame array based on the total number of frames to be rendered, which will then be parsed by function frame_farmer.
 */
 /** Structure Builder: This function creates frame array based on the total number of frames to be rendered, which will then be parsed by function frame_farmer. */
 /* distrenjob_enqueue: This function adds the job to the queue based on its priority */
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job) {
   struct distrenjob *prev_job = head; // create pointer to previous job
   struct distrenjob *current_job;     // create pointer to current_job (which job is being compared to)
   // 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;
       break;
+    }
     else if(job->priority < current_job->priority){ // if job's priority is less than 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;
   } /* for(current_job) */
+}
 /**
    @arg head I may end up changing the head if job == head
  */
 void change_job_priority(struct distrenjob *head, struct distrenjob *job, int new_priority){
   distrenjob_remove(head, job);
   job->priority = new_priority;
   struct distrenjob *current_job;
   struct distrenjob *prev_job = head;
   if(job->frameset[0].status == 0){ // if job was not yet started
     distrenjob_enqueue(head, job);
+  }
   else{ // if job has already been started then 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;
         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
 */
 /*@TODO: change frame_finder to job_finder */
 int frame_finder(struct distrenjob *head, struct distrenjob **job, struct frameset **frame)
+{
   int your_frame = 0;  // your_frame is an integer value that will be given to the client as the frame number to render
   short int your_job_type = 0;
   unsigned short int found;
   struct distrenjob *distrenjob_ptr;
   found = 0;
   while(!found)
+  {
     /* iterate through jobs from first to last */
     for(distrenjob_ptr = head->next; !found && !distrenjob_ptr; distrenjob_ptr = distrenjob_ptr->next)
+      {
         if(distrenjob_ptr->is_job_done)
           distrenjob_ptr->type = your_job_type;
+      }
     found = 0;
     // check the job type to see if the job is avaliable to be worked on
     switch(your_job_type)
+    {
       case 1: // blender
         found = 0;
         for(your_frame; !found; your_frame++)
+          {
             if(distrenjob_ptr->frameset[your_frame].status == 0)
+              {
                 found = 1;
                 distrenjob_ptr->frameset[your_frame].status = 1;
                 distrenjob_ptr->frameset[your_frame].start_time = clock();
                 break;
+              }
+          }
+    }
   } // 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");
           return 1;
+        }
     // the actual frame number to be rendered by the client is start_frame + your_frame
     // @TODO: refine how we want to return data from this
     //struct framejob { distrenjob_ptr; distrenjob_ptr->(&frameset[your_frame])};
       /* 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
            */
           distrenjob_ptr->frameset[counter].status = 0;
+      }
+}
 /**
    Finds a distrenjob struct based on the jobnum
    @arg jobnum job number to search for
    @return NULL on job doesn't exist
  */
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum)
+{
   struct distrenjob *distrenjob_ptr;
   /*
     The conditions of the for loop will leave distrenjob_ptr at NULL if the end of the list is reached. It will leave it pointing to the correct job if it is found.
    */
   for(distrenjob_ptr = head;
       distrenjob_ptr
         && distrenjob_ptr->jobnum != jobnum;
       distrenjob_ptr = distrenjob_ptr->next);
   return distrenjob_ptr;
+}
 /**
    Removes a distrenjob from the distrenjob linked list.
    @arg head a double pointer. the head pointer will have to be changed if distrenjob == *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 distrenjob_remove(struct distrenjob **head, struct distrenjob *bj)
+{
   struct distrenjob *previous_distrenjob;
   if(bj == *head)
     *head = bj->next;
   else
+    {
       for(previous_distrenjob = *head;
         previous_distrenjob
           && previous_distrenjob->next != bj; /*< stop on the distrenjob that comes before bj */
           previous_distrenjob = previous_distrenjob->next)
 	/* all of the action is in the definition of the for loop itself */;

0 comments (0 inline, 0 general)