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
 
@@ -121,45 +121,45 @@ int framenum;        // @TODO: Remotio s
 
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
 
@@ -173,25 +173,25 @@ if(gotframe ==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
 
  }
src/server/slavefuncs.c
Show inline comments
 
@@ -126,35 +126,35 @@ int delete_jobdata(int jobnum, char *dat
 
}
 

	
 
/** 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);
0 comments (0 inline, 0 general)