Files
@ c72bb4bd0892
Branch filter:
Location: DistRen/src/server/slave.c - annotation
c72bb4bd0892
4.9 KiB
text/plain
Uncommented the register_user call, which breaks the slave binary, why is it an undefined reference?
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 1f744ce71f83 c88f2cae0705 c88f2cae0705 3bd3e05fffc8 c88f2cae0705 c88f2cae0705 c88f2cae0705 c88f2cae0705 c88f2cae0705 c88f2cae0705 901eddfe43e9 144cab775ebd b95115259ec9 2833fc79e696 c89c9fbb46f7 cb6cee4cc6a4 144cab775ebd c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 1f744ce71f83 0b48f673ed7f eabe88569bb3 eabe88569bb3 eabe88569bb3 b4fe3a4fca78 50729768e5d3 c89c9fbb46f7 b4fe3a4fca78 b4fe3a4fca78 b4fe3a4fca78 b4fe3a4fca78 b4fe3a4fca78 b4fe3a4fca78 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 0b48f673ed7f c89c9fbb46f7 c89c9fbb46f7 b4fe3a4fca78 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c89c9fbb46f7 c72bb4bd0892 f70cfbc2aa25 0b48f673ed7f c89c9fbb46f7 c89c9fbb46f7 71b7b74b07a9 71b7b74b07a9 71b7b74b07a9 b95115259ec9 b95115259ec9 b95115259ec9 b95115259ec9 b95115259ec9 6015db8cc605 6015db8cc605 6015db8cc605 b95115259ec9 b95115259ec9 6015db8cc605 6015db8cc605 71b7b74b07a9 b95115259ec9 71b7b74b07a9 b4fe3a4fca78 b4fe3a4fca78 b4fe3a4fca78 0b48f673ed7f b4fe3a4fca78 b4fe3a4fca78 b95115259ec9 b95115259ec9 b95115259ec9 b4fe3a4fca78 b95115259ec9 b95115259ec9 0b48f673ed7f 50729768e5d3 b4fe3a4fca78 b4fe3a4fca78 7598c8d2871a eabe88569bb3 50729768e5d3 50729768e5d3 2507e13f4197 901eddfe43e9 6015db8cc605 901eddfe43e9 901eddfe43e9 901eddfe43e9 901eddfe43e9 6015db8cc605 0b48f673ed7f 6015db8cc605 50729768e5d3 50729768e5d3 50729768e5d3 50729768e5d3 0b48f673ed7f b4fe3a4fca78 0b48f673ed7f 1f744ce71f83 c88f2cae0705 | /*
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/>.
*/
/*
* **********************************************************************************
* Slave functions / etc resides below. Wouldn't a separate file make this easier??
*
* 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 "slavefuncs.h" // Slave functions
#include <string.h>
#include <stdio.h>
int slavestatus = 0; // Ugh global vars
int main(int argc, char *argv[])
{
int jobnum;
char *jobname;
int framenum;
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;
}
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, or if they're at the default (!key/!username) let the user know! */
if(key == NULL || username == NULL || strcmp(key, "!key") == 0 || 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", argv[0]);
}
else if(key != NULL && username != NULL || key != "!key" && username != "username" ){
fprintf(stderr, "Your username is %s, and your key is %s.\n",username, key);
loginuser(username); // Logs in user to the server
}
else{
fprintf(stderr,"Something is terribly wrong!!!");
}
/* Somewhat pseudo 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("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;
}
|