DistRen Changeset - 2507e13f4197 · protofusion repositories

Changeset - 2507e13f4197

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-07-26 00:03:25

Oh joy.

1 file changed with 1 insertions and 1 deletions:

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -61,66 +61,66 @@ int framenum; @@
 		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;
+		}
 		register_user(username, email); // register_user returns a uniquely random url to a key
 		fprintf(stderr, "You registered, hopefully successfully. Invoke distrenslave with no args now.");
+	}
 /* End arg parser */
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 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);
 /* End option getter */
 /* If there's no key or username in the conf, let them know! */
 	if(key == NULL || username == NULL){
 	  fprintf(stderr, "You didn't register! Please register (Invoke '%s -c <username> <emailaddr> to register) or add your username to distrenslave.conf\n", argv[0]);
+	}
 	else if(key != NULL || username != NULL){
 		loginuser(username); // Logs in user to the server
+	}
 	else{
 		fprintf(stderr,"Something is terribly wrong!!!");
+	}
 /* Rendering code */
 	if('slave recieves "start frame#, job#"'){
 		fprintf(stderr, "Got frame %d in job %d, preparing to render...",framenum,jobnum);
 		get('http://distren.protofusion.org/srv/job%d.tgz', jobnum); // use curl
 		exec('tar -xvf job%d.tgz /tmp/distren/job%d',jobnum,jobnum); // 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)
+		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)
 			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, uploading...",framenum,jobnum);
 		curl_POST("/path/to/output.jpg", "http://protofusion.org/distren/output/job%d",jobnum);
 		tell_the_server(DISTREN_REQUEST_DONEFRAME); // AKA "I'm done rendering that frame you sent me"
 		// Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
+	}
   return 0;
+}

0 comments (0 inline, 0 general)