DistRen Changeset - fea8bac851bf · protofusion repositories

Changeset - fea8bac851bf

Parent rev.

Child rev.

[Not reviewed]

default

0 3 1

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

moved struct blendjob and frameset to header

4 files changed with 73 insertions and 31 deletions:

src/server/Makefile.am

src/server/blendjob.h

src/server/distrend.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/Makefile.am

➞

Show inline comments

 COMMON_SOURCES =  slavefuncs.c slavefuncs.h blendjob.h
 bin_PROGRAMS = distrend distrenslave
-distrend_SOURCES = distrend.c slavefuncs.c slavefuncs.h
+distrend_SOURCES = distrend.c ${COMMON_SOURCES}
 distrend_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistrencommon.la
 distrend_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common
-distrenslave_SOURCES = slave.c slavefuncs.c slavefuncs.h
+distrenslave_SOURCES = slave.c ${COMMON_SOURCES}
 distrenslave_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistrencommon.la
 distrenslave_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common

src/server/blendjob.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _DISTREN_BLENDJOB_H
 #define _DISTREN_BLENDJOB_H
 /**
    This file stores the blendjob and frameset structs and prototypes for some functions to manipulate/use these.
  */
 #include <time.h> /* clock_t */
 typedef unsigned int jobnum_t;
 /**
    Stores Blender Job Info
 */
 struct blendjob {
   struct blendjob *next; /*< next will be NULL unless if there is another blendjob */
   char *name;
   char *submitter;
   char *email;
   jobnum_t jobnum;
   int priority;  // 1 is lowest, 10 is highest, 0 means the job is done
   int percent_done;
   int completed_frames; // number of completed frames for stats/etc
   int assigned_frames; // number of assigned frames (that are not yet completed) for stats/etc
   int total_frames; // how many frames are in the animation for stats/etc (unassigned frames)
   int avg_render_time; // average seconds it took to render a frame
   unsigned int time_remaining; // estimated seconds remaining till render is complete (up to 49, 710 days)
 							   // 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 num; /*< frame number to render */
   char slave_name; /*< user that frame is assigned to */
   int 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() */
 #endif

src/server/distrend.c

➞

Show inline comments

@@ @@ -7,168 +7,141 @@ @@
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   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
  */
 /* XML notes --
+ *
  * First off, is XML in our build environment?
  * Next, what files are we going to have?:
  *  - XML file sent with (.blend/.pov/.lux(xml)/whatever) by distren telling the server what to do
  *  	+ Includes submitter name, filename, emailaddress, etc
  *  - XML file on server storing info on current and finished jobs
  *  - XML file sent by distren when submitting a render to the server
+ *
  *  Overall, we could use XML to make our client/server communication load
  *  a lot lighter, especially if clients are sent customized xml files telling
  *  them what frame(s) to render... although that would be inefficient if rendering
  *  single frames. Maybe not tell it what frames to render in the xml file, the server
  *  can spit out that info.
+ *
  *  Please edit my ramblings if you please,
  *  --ethanzonca
+ *
  */
 #include "execio.h"
 #include "options.h"
 #include "blendjob.h"
 #include <confuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h> /* getopt */
 #include <time.h>
 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.
  Then we will need some sort of watchdog to monitor slaves on the main server to check for stales. Maybe not worry about this for now.
 */
 struct general_info {
 	short int jobs_in_queue; //
 	unsigned short int free_clients;
 	unsigned short int rendering_clients;//
 	unsigned short int total_finished_jobs; //
 	unsigned int total_frames_rendered; //
 } general_info;
 // Stores Blender Job Info
 struct blendjob {
   struct blendjob *next; /* next will be NULL unless if there is another blendjob */
   char *name;
   char *submitter;
   char *email;
   jobnum_t jobnum;
   int priority;  // 1 is lowest, 10 is highest, 0 means the job is done
   int percent_done;
   int completed_frames; // number of completed frames for stats/etc
   int assigned_frames; // number of assigned frames (that are not yet completed) for stats/etc
   int total_frames; // how many frames are in the animation for stats/etc (unassigned frames)
   int avg_render_time; // average seconds it took to render a frame
   unsigned int time_remaining; // estimated seconds remaining till render is complete (up to 49, 710 days)
 							   // 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 num; // frame number to render
 	char slave_name; // user that frame is assigned to
 	int 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 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(struct blendjob **blendjobs_head);
 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].status = 2;
   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;

src/server/slavefuncs.h

➞

Show inline comments

 /*
   Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _DISTREN_SLAVEFUNCS_H
 #define _DISTREN_SLAVEFUNCS_H
 #include "blendjob.h"
 void registeruser(char *username, char *email);
 void loginuser(char *username);
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame);
 #endif

0 comments (0 inline, 0 general)