DistRen Changeset - 977179850e7e · protofusion repositories

Changeset - 977179850e7e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

moved global vars after declarations, where they should be

1 file changed with 6 insertions and 4 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -17,52 +17,48 @@ @@
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* This file contains the code which both processes (renders) jobs as a slave, and the code which distributes frames to slaves after receiving them from the client portion of the codebase. */
  /* Just some notes -- Ethan Zonca
  * ++ Make data availible for other apps to parse
  * Server<==>Client Communication
  * Upload while rendering
  */
 #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>
 // Global Vars, try to cut down on these
 jobnum_t 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
 typedef unsigned int jobnum_t;
 /* ******************* Structs ************************ */
 // Stores config info? editmycomment
 struct distrend_config
+{
   cfg_t *mycfg;
   struct options_common *options;
   struct distrend_listen **listens; /*< Null terminated array of structs */
 };
 /*
  frame[frame] Status Assignments:
   "NULL" - don't render me
   "0" - canceled
   "1" - unassigned
   "2" - assigned to slave
   "3" - completed by slave and uploaded
  Have a script crawl through each job in the arrays, priority-biased, and assign a frame to each slave.
@@ @@ -94,48 +90,54 @@ struct blendjob { @@
 							   // we can have the client computer convert it into days, hours, etc if they wish to view it
   struct frameset *frameset;
 };
 // Frameset Structure
 struct frameset {
 	int frame_num; // frame number to render
 	char slave_name; // user that frame is assigned to
 	int frame_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[]; // Frameset array is generated by status_report_generator function
                          // Using this method to save memory, because if animation starts on a high frame number, it would waste a lot of RAM on empty structures
 /*
   internally defined funcs's prototypes
 */
 void status_report_generator();
 void blendjob_remove(struct blendjob **head, struct blendjob *bj);
 struct blendjob *blendjob_get(struct blendjob *head, jobnum_t jobnum);
 /* Global Vars, try to cut down on these */
 jobnum_t 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
 /* ********************** Functions ************************* */
 void start_data(){
 	if(1 == 0){
 		// retrieve total_finished_jobs and total_finished_frames from xml file
+	}
 	else{
 		general_info.total_finished_jobs = 0;
 		general_info.total_frames_rendered = 0;
+	}
+}
 // **** Finish-Setter: Sets a frame to the "completed" status.
 void finish_frame(struct blendjob *blendjob, int frame){
   blendjob->frameset[frame].frame_status = 2;
   blendjob->frameset[frame].time_to_render = (clock() - blendjob[jobnum].frameset[frame].start_time); // Consider changin time-to-render to time-for-frame or something?
   general_info.total_frames_rendered++; // Increase total frames var for stats
+}
 // **** Queuer: Adds files to the queue
 void queue(struct blendjob *blendjob, int type, char *name, char *submitter, char *email, int priority, int mode, int spp, struct frameset *frameset) {

0 comments (0 inline, 0 general)