DistRen Changeset - 7647047dfa9d · protofusion repositories

Changeset - 7647047dfa9d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-08-03 00:21:59

Psedo-code edit, buggy, needs work.

1 file changed with 28 insertions and 7 deletions:

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

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/>.
  */
 // Provides DISTREN_REQUEST* which is in reality, DISTREN_SEND(signal) in the minds of your average joe
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
 #include "slavefuncs.h" // Slave functions
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "asprintf.h"
 int slavestatus = 0; // Ugh global vars
 int main(int argc, char *argv[])
+{
 int counter;
 /* Parses arguments, skips if there are no args */
 for(counter=0; counter<argc; counter++){
 	if(strcmp(argv[counter], "-h") == 0) {
 		fprintf(stderr, "Usage: distrenslave [option] <username> <emailaddr>\nStarts a distren slave\n\t-h\tshow this help\n\t-c\tregisters a user with [username] and [emailaddr] \n");
 		return 2;
+	}
+}
 	if(argc>1
 		&& (strcmp("-c", argv[1]) == 0))
+	{
 		char *username;
 		char *email;
 		if(argc != 4)
+		{
 			fprintf(stderr, "I need more arguments!\n%d is not enough!\n Invoke 'distrenslave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!\n'", argc - 1);
 			return 234;
+		}
 		username = argv[2];
 		email = argv[3];
 		if(!strchr(email, '@'))
+		{
 			fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
 			return 235;
+		}
 		if( register_user(username, email) == 1){
 			// register_user generates a key, too */
 			fprintf(stderr,"Registration successfull. You may now invoke distrenslave with no arguments.\n");
 			return 0;
+		}
 		else{
 			fprintf(stderr,"Please try again! :D\n");
 			return 0;
+		}
+	}
 /* End arg parser */
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 char *username;
 username = NULL;
 cfg_t * my_cfg;
 cfg_opt_t myopts[] = {
 		CFG_SIMPLE_STR("username", &username),
 		CFG_END()
 		};
 struct options_common *commonopts;
 options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
 /* End option getter */
 /* Notifies the user if there is no username in the conf file */
 	if(username == NULL || strcmp(username, "!username") == 0 ){
 	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+	}
 	else if( username != NULL || strcmp(username,"!username") != 0 ){
 		// Logs ya in:
 		if(login_user(username) == 1){
 			fprintf(stderr,"You should now be logged into distren.\n");
+		}
 		else{
 			fprintf(stderr,"Login failed. I have no clue why. Sorry.\n");
 			return 0;
+		}
+	}
 	else{
 	  fprintf(stderr,"Something is terribly wrong!");
+	}
 /* Somewhat pseudo Rendering code */
 /*
 	if('slave recieves "start frame#, job#"'){
 /* These should all be filled by remotio and other code */
 int jobnum;
 int framenum;
 int slaveget;
 int telldone;
 int blender_is_running;
 char *jobdatapath = "/path/to/job.tgz";
 char *outputpath = "/path/to/output.jpg";
 char *pathtoblend; // oh, blender-specific horribleness
 // If the slave is getting a frame (fill jobnum, framenum, and slaveget vars when this happens)
 	if(slaveget ==1){
 		fprintf(stderr, "Received %d in job %d, preparing to render...",framenum,jobnum);
 		get('http://distren.protofusion.org/srv/job%d.tgz', jobnum); // use curl
 		char *jobdataurl;
 		_distren_asprintf(&jobdataurl, "http://protofusion.org/distren/stor/job%d.tgz",jobnum);
 		curlget(jobdataurl, jobdatapath); // downloads job data from the url to the path stated
 		_distren_asprintf(&pathtoblend, "%s/job.blend", jobdatapath ); // @TODO: Fix jobdatapath so it knows where to get the file for real :D
 		exec('tar -xvf job%d.tgz /tmp/distren/job%d',jobnum,jobnum); // somehow
-		exec_blender("GIVE ME SOME ARGS!"); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later)
+		exec_blender(blendjob, pathtoblend, outputpath, framenum); // So this should grab data from the struct? I have no idea. @TODO: Ohnobinki, we should clear this up.
 		// Consider placing the following in the exec_blender() function
 			while(blender_is_running == 1){
 				tell_the_server(DISTREN_REQUEST_PROGRESS);
 				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
+				sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
+			}
 		telldone=1; // When done rendering, set this.
+	}
 	if(telldone==1){
 		fprintf(stderr, "Finished frame %d in job %d, uploading...",framenum,jobnum);
 		curl_POST("/path/to/output.jpg", "http://protofusion.org/distren/output/job%d",jobnum);
 		char *outputurl;
 		_distren_asprintf(&outputurl, "http://protofusion.org/distren/stor/job%d/",jobnum); // Throws the jobnum nicely in the string
 		curlpost(outputpath, outputurl); // posts the output at outputpath to the server at outputurl
 		tell_the_server(DISTREN_REQUEST_DONEFRAME); // AKA "I'm done rendering that frame you sent me"
 		telldone=0;
 		// Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
+	}
-*/
   return 0;
+}

0 comments (0 inline, 0 general)