Changeset - 2e6b26cb909d
[Not reviewed]
default
0 2 0
ethanzonca - 16 years ago 2009-10-10 17:54:42

Minor updates
2 files changed with 8 insertions and 8 deletions:
0 comments (0 inline, 0 general)
src/server/slave.c
Show inline comments
 
@@ -85,139 +85,139 @@ cfg_opt_t myopts[] = {
 
    CFG_SIMPLE_STR("username", &username),
 
    CFG_SIMPLE_STR("datadir", &datadir),
 
    CFG_END()
 
  };
 
struct options_common *commonopts;
 

	
 
username = NULL;
 
options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
 
/* End option getter */
 

	
 
software_updatecheck(datadir); // Should be run every day-ish, if the slave is constantly running.
 

	
 
/* 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!");
 
}
 

	
 

	
 

	
 
/* Code-filled Variables  */
 
int jobnum;          // The job number that we're currently working
 
int framenum;        // @TODO: Remotio should fill this
 

	
 
int gotframe = 0;        // set this to 1 after data for a job is received from the server
 
int busy = 0;        // Client business 1=busy 0=idle
 

	
 
char *urltoTar;      // Full URL to the server-side location of job#.tgz
 
char *pathtoTar;     // Full path to the location of the job#.tgz
 

	
 
char *urltoOutput;   // Full URL where output is posted
 
char *pathtoJobfile; // Full path to the job's main file
 
char *pathtoXml;     // Full path to the job's xml file
 
char *pathtoOutput;  // Full path to the output (rendered) file
 
char *outputExt;     // Output Extension (e.g., JPG)
 

	
 
char *tarcmd;        // Command to run for tar. Migrate to libtar sometime
 
char *outdir;        // Output Directory for tar
 
char *jobdatapath;   // Path to job data
 

	
 
struct distrenjob *myjob; // Structure to hold data gathered from the XML file
 

	
 
/* If the server says that every frame for jobnum is finished */
 
if( 1 == 0)
 
  {
 
    delete_jobdata(jobnum, datadir);
 
  }
 

	
 
// If the slave is getting job info...
 
if(gotframe ==1)
 
{
 
  /* @TODO: Add remotio hooks */
 
  // jobnum = remoteio_read(jobnum); // Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile)
 
  // jobnum = remoteio_read(jobnum); // Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile
 
  jobnum = 0;
 
  //framenum = remoteio_read(jobnum); // Set framenum from remoteio
 
  framenum = 0;
 

	
 
  char *tarcmd;
 
  char *outdir;
 
  char *jobdatapath;
 

	
 
  fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
 

	
 
  /**
 
     Variable Preparation
 
     @todo find where to free() all of these
 
  */
 
  _distren_asprintf(&jobdatapath, "job%d", jobnum);
 
  _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz",jobnum); // Prepares URL to download from
 
  _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
 
  _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
 
  _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted
 
  _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml",datadir, jobnum ); // Prepares the path to the job's XML file
 

	
 
  // Downloads the job tar if it isn't  present. @TODO: Delete old job data
 
  struct stat buffer;
 
  int fstatus = stat(pathtoJobfile, &buffer);
 

	
 
  // If stat'ing the jobfile shows that the jobfile doesn't exist, we'll download it.
 
  if(fstatus == -1){
 
    // Downloads the Tar @TODO: add progress bar
 
    if( curlget(urltoTar, pathtoTar) == 0){
 
      fprintf(stderr, "File downloaded without errors\n");
 
    }
 
    else{
 
      fprintf(stderr, "Download tar from server failed. Either the server is down, or the job hosting system is screwed up.\nContact admin@protofusion.org and include this message.\nGoodbye. Better luck next time.\n");
 
    }
 
  }
 
  else{
 
    fprintf(stderr, "Using cached job file...\n");
 
  }
 

	
 
  _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @todo free() */
 
  _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @TODO: free() */
 
  mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
 
  mkdir(outdir, 0750);
 

	
 
  _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
 
  system(tarcmd);
 
  free(tarcmd);
 

	
 
  // Parses a job's XML file, puts data in the myjob struct
 
  if(xml2distrenjob(&myjob, pathtoXml) == 0){
 
    fprintf(stderr,"Well, the XML craziness may have worked. Maybe. \n");
 
    distrenjob_free(&myjob); // Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails
 
  }
 
  else{
 
    fprintf(stderr,"I think the XML craziness may have failed, so I'll terminate just for fun.\n");
 
    return 1;
 
  }
 

	
 
  /* Variable-fillers which require XML */
 
  outputExt = myjob->output_format; /* @TODO: FIXME! */
 
  _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); // Prepares the path to the jobfile
 

	
 

	
 
  /** Series of IF's for jobtype based on xml content */
 
  if(1==1){
 
   exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D
 
  }
 
  // When blender is finished, run this...
 
  fprintf(stderr, "Finished frame %d in job %d, uploading...",framenum,jobnum);
 
  curlpost(pathtoOutput, urltoOutput); // uploads (HTML POST) the output at outputpath to the server at outputurl
 
  tell_the_server(DISTREN_REQUEST_DONEFRAME); // Tells the server that it's finished rendering this frame
 
  busy=0;
 
  // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
 

	
 
}
 

	
 

	
 
  return 0;
 
}
src/server/slavefuncs.c
Show inline comments
 
@@ -90,107 +90,107 @@ int software_updatecheck(char *datadir){
 
  }
 

	
 
  // Read local version
 
  {
 
    FILE * localVersionFile;
 
    localVersionFile = fopen(pathtolocalVersion, "r");
 
    fscanf(localVersionFile, "%s",localVersion);
 
    fclose(localVersionFile);
 
  }
 

	
 

	
 
  // If a rendering engine was never downloaded
 
  if( stat(SYSCONFDIR "/engines/blender", &buffer) == -1){
 
    fprintf(stderr,"You don't have the blender engine. Preparing to download...");
 
    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", engineDownloadPath); // Add calls for operating system info
 
    // untar(SYSCONFDIR "/engines/blender.tgz");
 
  }
 

	
 
  // If a rendering engine is out-of-date
 
  else if( serverVersion != localVersion){
 
    fprintf(stderr,"You don't have the latest blender engine. Preparing to download...");
 
    curlget("http://protofusion.org/distren/srv/blender-lin32-dist.tgz", engineDownloadPath); // Add calls for operating system info
 
    // untar(SYSCONFDIR "/engines/blender.tgz");
 
  }
 

	
 
  return 0;
 
}
 

	
 
/** Stub for deleting job data from the disk. @TODO: unstubify me! */
 
int delete_jobdata(int jobnum, char *datadir)
 
{
 
  char *jobpath;
 
  _distren_asprintf(&jobpath, "%s/%d", datadir, jobnum);
 
  rmdir(jobpath);
 
  fprintf(stderr, "I just failed to remove all of your job data because I can only delete empty directories! Haha!\nPlease contact the dev team :D\n\tWe'd be overjoyed to know that someone was willing to try to use this in this devel/design/planning stage ;-)\n");
 
  return 0;
 
}
 

	
 
/** Stub stub stubbiness ugh @TODO: Kill me. */
 
void tell_the_server(int stuff){
 
}
 

	
 
/** Function referenced by curlget() to write data to disk. */
 
size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream)
 
 {
 
    return fwrite(ptr, size, nmemb, stream);
 
  }
 

	
 
/** Helper function for cURL's progressbar */
 
/** Helper function for cURL's progress display */
 
int curl_progress( char *Bar,double t,double d,double ultotal,double ulnow)
 
{
 
fprintf(stderr,"Downloading... %f%% complete\r",d/t*100);
 
return 0;
 
}
 

	
 
/** Retrieves a URL with cURL and saves it to disk */
 
int curlget(char *url, char *out){
 

	
 
  double *Bar; // Stores cURL progressbar info
 
  double *Bar; // Stores cURL progress display info
 
  CURL *curl;
 
  CURLcode res;
 
  FILE *outfile;
 

	
 
  curl = curl_easy_init();
 
  if(curl) {
 
	outfile = fopen(out, "w"); // Open where we're writing to
 

	
 
  curl_easy_setopt(curl, CURLOPT_URL, url);
 
  curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
 
  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_writetodisk); // this MUST be set for win32 compat.
 
  curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
 
  curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_progress);
 
  curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &Bar);
 
  res = curl_easy_perform(curl);
 
  curl_easy_cleanup(curl);
 
  }
 
  fprintf(stderr,"\n"); // Clears out he progressbar's carriage return
 
  return res; // 0 means OK, nonzero means AAAH badness
 
}
 

	
 
/** Posts a file to a url with cUrl */
 
int curlpost(char *filename, char *url){
 
  char *targetname = "uploadedfile"; // Name of the target in the php file on the server (Don't change me unless you have different PHP code)
 
  CURL *curl;
 
  CURLcode res;
 
  struct curl_httppost *formpost=NULL;
 
  struct curl_httppost *lastptr=NULL;
 
  struct curl_slist *headerlist=NULL;
 
  static const char buf[] = "Expect:";
 

	
 
  curl_global_init(CURL_GLOBAL_ALL);
 

	
 
  /* upload field... */
 
  curl_formadd(&formpost,
 
               &lastptr,
 
               CURLFORM_COPYNAME, targetname,
 
               CURLFORM_FILE, filename,
 
               CURLFORM_END);
 
  /* filename field... */
 
  curl_formadd(&formpost,
 
               &lastptr,
 
               CURLFORM_COPYNAME, "filename",
 
               CURLFORM_COPYCONTENTS, filename,
 
               CURLFORM_END);
 
  /* submit field, not usually needed, just in case... */
 
  curl_formadd(&formpost,
 
               &lastptr,
0 comments (0 inline, 0 general)