DistRen Changeset - d891672fc009 · protofusion repositories

Changeset - d891672fc009

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-07-25 00:25:35

Psuedo-code editing, register_user needs to return a string unique url in http://protofusion.org/distren/key/[string]

2 files changed with 12 insertions and 8 deletions:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -35,33 +35,37 @@ int main(int argc, char *arvg[]) @@
 	int slavestatus = 0;
 	if('no username in config file, no key present'){
 		fprintf(stderr "run distrend -c username] [emailaddr] to register")
+	}
 	if('they use a -c flag according to getopt, with 2 args'){
 		register_user(username, email); // which returns a uniquely random url to a key
 		get(uniquely-random-url-to-key);
 		*key = register_user(username, email); // register_user returns a uniquely random url to a key
 		get("http://protofusion.org/distren/key/%s",key);
 		fprintf(stderr, "you registered, hopefully successfully. Invoke distrend with no args now.");
+	}
 	if('username is in conf file and key is present'){
 		loginuser(username);
+	}
 	if('slave recieves "start frame#, job#"'){
 		fprintf(stderr, "Got frame %d in job %d, preparing to render...",frame,job);
 		get('http://distren.protofusion.org/srv/job#.tgz');
 		exec('tar -xvf job#.tgz /tmp/distren/job#'); // somehow
-		exec_blender(job#.blend, job#.frame#.JPG, job#); // (check the args, we'll need to adjust for different output formats)... set SLAVESTATUS=1 while rendering, SLAVESTATUS=2 when done
+		exec_blender(jobname.blendfile, jobnum.framenum.JPG, jobnum); // (check the args, we'll need to adjust for different output formats)... set SLAVESTATUS=1 while rendering, SLAVESTATUS=2 when done
+	}
 	if(SLAVESTATUS==2){
 		tell_the_server("done with frame# in job#");
 		tell_the_server("Completed");
 		fprintf(stderr, "Finished frame %d in job %d",framenum,jobnum);
 		SLAVESTATUS=0;
+	}
 	if(SLAVESTATUS==0){
 		tell_the_server("i ain't got no frames to render");
 		tell_the_server("Idle");
 		fprintf(stderr, "Idle. No frames to render.");
+	}
 	while(SLAVESTATUS==1){
 		tell_the_server("rendering this friggn frame");
 		delay(1000); // or not
 		tell_the_server("Rendering");
 		fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
 		delay(1000); // or not... this should be more event-driven, but should still give a heartbeat to the server
+	}
   return 0;
+}

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
  /*
   * Registration on server. Needs attention. Prevent account spamming.
-  * Key transfer via httpd md5sum filename?
+  * TODO: MAKE THIS FUNCTION RETURN THE UNIQUE URL TO THE USER'S KEY!!!
   * Set up something like: distrend -c username email@example.com
  */
 void registeruser(char *username, char *email){
   /*
    * Logs into sandboxed user on zserver2 and registers a user. Should eventually generate a key on the server and return it to the user.
    * All created user accounts should be sandboxed accordingly, requiring a different skel, and the default shell to be rbash. Also,

0 comments (0 inline, 0 general)