DistRen Changeset - f70cfbc2aa25 · protofusion repositories

Changeset - f70cfbc2aa25

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-07-25 01:24:43

Binary name changes for fprintf's, minor changes

2 files changed with 6 insertions and 6 deletions:

etc/distrenslave.conf

src/server/slave.c

0 comments (0 inline, 0 general)

etc/distrenslave.conf

➞

Show inline comments

 slave
+{
   username = "";
   key = "";
   username = "!username";
   key = "!key";
+}
 include("distrencommon.conf")

src/server/slave.c

➞

Show inline comments

@@ @@ -25,84 +25,84 @@ @@
  * Slave listens on server for a command in the format of each function...
  * We need if's for returns... ==> watchdog
  * **********************************************************************************
 */
 // 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 <string.h>
 int slavestatus = 0; // Ugh global vars
 int main(int argc, char *argv[])
+{
 /* Parses arguments, skips if there are no args */
 	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 'slave -c <username> <emailaddr> to register. \n Already registered? Edit your distrenslave.conf file!'", argc - 1);
+			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!'", 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;
+		}
 		*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.");
 		exec('echo %s >> distrend.conf',key);
 		fprintf(stderr, "You registered, hopefully successfully. Invoke distrenslave with no args now.");
 		exec('echo %s >> distrenslave.conf',key);
+	}
 /* End arg parser */
 char *username;
 char *key;
 username = NULL;
 key = NULL;
 cfg_t * my_cfg;
 cfg_opt_t myopts = {
 		CFG_SIMPLE_STR("username"), &username),
 		CFG_SIMPLE_STR("key"), &key),
 		CFG_END()
 		};
 struct options_common *commonopts
 options_init(argc,argv,&my_cfg, &myopts, "slave", &commonopts);
 	if(key == NULL || username == NULL){
-		fprintf(stderr,"You didn't register! Please register or add your username to distrenslave.conf");
+		fprintf(stderr,"You didn't register! \n Please register (Invoke 'distrenslave -c <username> <emailaddr> to register) \nor add your username to distrenslave.conf");
+	}
 	else if(key != NULL || username != NULL){
 		loginuser(username); // Logs in user to the server
+	}
 	else{
 		fprintf(stderr,"Something is terribly wrong!!!");
+	}
 	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(jobname.blendfile, jobnum.framenum.JPG, jobnum); // (check the args, we'll need to adjust for different output formats, include this in the blendjob struct later)
 			while('blender is running'){
 				SLAVESTATUS=1; // really quite pointless now, but why not. Could be nice for logging.
 				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
+			}
 		SLAVESTATUS=2; // When done rendering, set this.
+	}
 	if(SLAVESTATUS==2){
 		fprintf(stderr, "Finished frame %d in job %d",framenum,jobnum);

0 comments (0 inline, 0 general)