DistRen Changeset - 80c9092dbaa9 · protofusion repositories

Changeset - 80c9092dbaa9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-07-25 21:32:07

Cosmetics, minor stuff

1 file changed with 5 insertions and 5 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -135,49 +135,49 @@ void blendjob_remove(struct blendjob **h @@
 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].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?
+  blendjob->frameset[frame].time_to_render = (clock() - blendjob[jobnum].frameset[frame].start_time); // Consider changing 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) {
 	// Type: 1 = blender, add more types later
 	// jobnum is the next available job number
 	if(type == 1){
     blendjob->name = name;
     blendjob->submitter = submitter;
     blendjob->email = email;
     blendjob->priority = priority;
     blendjob->frameset = frameset;
+  }
   else{
     // Throw error.
+  }
 jobnum++; // Advance the jobnumber for the next queued job
+}
 /**
@@ @@ -485,51 +485,51 @@ int main(int argc, char *argv[]) @@
   int cont = 1;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
   distrend_do_config(argc, argv, config);
   distrend_listen(&listenset, config);
   /* This is called the ``main loop'' */
   while(cont)
+    {
       struct distren_action *action;
       distrend_accept(&action);
       cont = distrend_do(action);
       /* Somewhat Pseudo-code for basic server operation, should be more event-driven */
       start_data();
       status_report_generator(); // TODO: Add correct args
       blend_frame_watchdog();	 // TODO: Add correct args
 // TODO: Okay, so the slave really needs 3 statuses, not just "idle" and "working" so the server can tell when it finishes a frame
 int iteration; // We shouldn't need this.
 int framenum;
 int jobnum;
       /* If the client is idle */
       	if(clientstatus == DISTREN_REQUEST_DONEFRAME && iteration > 0){
       /* If the client is idle (meaning a client without the "busy" status connected via ssh) */
       	if(clientstatus == idle && iteration > 0){
       		framenum = frame_finder(); // give framefinder args, framefinder should return job number and frame number
       		jobnum = frame_finder();
       		remotio_send_to_client(framenum);
+      	}
       /* If the client's status changes from running to idle */
       	if(clientstatus == DISTREN_REQUEST_DONEFRAME && iteration == 0){
       		finish_frame(jobnum, framenumprevious); // make it finish the previous frame or something.
       		frame_finder() ==> returns jobnum/framenum that are sent to slave, "render jobnum framenum"
+      	}
       /* End Somewhat Pseudo-code */
       distrend_action_free(action);
+    }
   distrend_unlisten(listenset);
   distrend_config_free(config);
   return 0;
+}

0 comments (0 inline, 0 general)