DistRen Changeset - 8c97631a877d · protofusion repositories

Changeset - 8c97631a877d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-09-03 00:11:31
e@ethanzonca.com

Cleaned up cmdline output

2 files changed with 8 insertions and 3 deletions:

src/server/simpleslave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -157,110 +157,110 @@ if(updateConf){ @@
   int framenum = 0;
   int slavekey = atoi(username); // @TODO: Make this more friendly
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   char *pathtoTardir;
   // Temporary for uncompressed testing
   // char *urltoJobfile;
   char *urltoOutput;   /* Full URL where output is posted */
   char *pathtoOutput;  /* Full path to the output (rendered) file */
   char *pathtoOutdir;  /* Full path to output directory */
   char *pathtoRenderOutput; /* Contains blender framenum placeholder */
   char *urltoJobfile; /* Used if we aren't using compression */
   char *pathtoJob; /* Path to job data folder */
   char *pathtoJobfile; /* Full path to the job's main file */
   char *outputExt = "jpg";     /* Output Extension (e.g., JPG) */
   int haveWork = 0;
   int quit = 0;
   fprintf(stderr,"\nDistRen SimpleSlave Pre-Alpha %s\n- Experimental build: Use at your own risk!\n\n", PACKAGE_VERSION);
   /* @TODO @FIXME create datadir (/var/distren/) if it doesn't exist, or notify the user */
   int benchmarkTime = 0;
   int renderPower = 0;
   // @TODO: create _web function to force recalc if !isset($render_power) on server
   if(runBenchmark)
+    {
       if(slaveBenchmark(datadir, &benchmarkTime, &renderPower))
+	{
 	  fprintf(stderr,"Benchmark failed! Exiting.\n");
 	  return 1;
+	}
       else
+	{
 	  fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n",
 		  benchmarkTime, renderPower);
 	  _web_setrenderpower(slavekey, password, renderPower);
 	  return 0;
+	}
+    }
   if(!DEBUG)
     fprintf(stderr, "Running..");
+    fprintf(stderr, "Running...");
   // Main loop
   while(!quit)
+    {
     // request work
     if(DEBUG)
       fprintf(stderr,"Requesting work from %s...\n", hostname);
     haveWork = _web_getwork(slavekey, password, &jobnum, &framenum);
     /* If we got a frame */
     if(haveWork)
+      {
-        fprintf(stderr,"Got work from server...\n");
+        fprintf(stderr,"\nGot work from server...\n");
         if(DEBUG)
           fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
         prepareJobPaths(jobnum, framenum, outputExt, datadir, &urltoTar, &pathtoTar, &pathtoTardir, &pathtoJob, &pathtoJobfile, &urltoJobfile, &urltoOutput, &pathtoOutput, &pathtoRenderOutput, &pathtoOutdir);
         //free(outputExt);
         mkdir(pathtoTardir, 0700);
         int dlret = downloadTar(urltoTar, pathtoTar);
         //int dlret = downloadTar(urltoJobfile, pathtoJobfile);
         if(dlret == 0)
           fprintf(stderr,"Data retrieved successfully!\n");
         else if(dlret == 3){
           _web_resetframe(slavekey, password, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
           return 0; // ouput dir doesn't exist
+        }
         else
           if(DEBUG)
             //fprintf(stderr,"Using existing uncompressed data %s...\n", pathtoJobfile);
             fprintf(stderr,"Using existing tarball %s...\n", pathtoTar);
         // Check if tar exists already
         struct stat jbuffer;
         int jstatus = stat(pathtoJobfile, &jbuffer);
         if(jstatus == -1){
           fprintf(stderr,"Main job file does not exist, extracting...\n");
           // If error unpacking tarball
           if(unpackJob(pathtoJob, pathtoTar)){
             _web_resetframe(slavekey, password, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
             fprintf(stderr,"Extraction failed, exiting.\n");
             return 1;
+          }
 	  else
 	    if(DEBUG)
               fprintf(stderr,"Whatever happened in the unpackjob() function supposedly worked.\n");
+        }
 	else{
 	  if(DEBUG)
 	    fprintf(stderr,"Using already extracted data.\n");
+        }
         struct stat tbuffer;
         int tstatus = stat(pathtoJobfile, &tbuffer);
 	if(tstatus == -1){
           fprintf(stderr,"The main job file does not exist! Data may be corrupt, or the archive is malformatted.\n");
           return 1;
+        }
         /* ignore return because directory may exist already */

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -331,109 +331,110 @@ int distren_mkdir_recurse(const char *di @@
 	      perror("mkdir");
 	      free(nextdir);
 	      return 1;
+	    }
           nextdir[counter] = '/';
+        }
+    }
   ret = mkdir(nextdir, S_IRWXU | S_IRGRP | S_IROTH);
   if(ret == -1
      && errno != EEXIST)
+    {
       perror("mkdir");
       free(nextdir);
       return 1;
+    }
   free(nextdir);
   return 0;
+}
 /**
  @TODO: Use for constructing path to job data locally and/or on data.distren.org
  */
 int job_build_path(char *filename, unsigned int jobnum)
+{
   return 0;
+}
 int downloadTar(char *url, char *destinationPath){
   // Prepare to download the job tar if it isn't  present
   struct stat buffer;
   int fstatus = stat(destinationPath, &buffer);
   if(fstatus == -1)
+    {
       // Download the Tar
       int ret = curlget(url, destinationPath);
       if(ret == 0){
         fprintf(stderr, "Job data retrieved successfully\n");
         // free(url); @FIXME: causes doublefree! Curl must free the url?
         return 0;
+      }
       else if(ret == 1){
         fprintf(stderr, "Downloading job data from %s failed. Check your network connection.\n",url);
         free(url);
         return 1; // Eventually make a retry loop
+      }
+    }
   if(DEBUG)
   fprintf(stderr, "Tar at %s already exists! Download cancelled.\n", destinationPath);
   return 2;
+}
 int uploadOutput(char *pathtoOutput, char *urltoOutput, int jobnum, int framenum, int slavekey){
   //fprintf(stderr,"Uploading output %s to url %s for job %d and frame %d for slavekey %d", pathtoOutput, urltoOutput, jobnum, framenum, slavekey);
   if( !curlpost(pathtoOutput, urltoOutput, jobnum, framenum, slavekey)) // Uploads output
+    {
       if(DEBUG)
         fprintf(stderr,"Upload successful, removing old output...\n");
       else
-        fprintf(stderr,"Upload completed\n");
+        fprintf(stderr,"Uploaded\n");
       remove(pathtoOutput); // Delete the file after its uploaded
       return 0;
+    }
   else
+    {
       fprintf(stderr,"Upload failed. Check your network connection. Retrying upload...\n");
       int tries=1;
       while(tries<=10 && curlpost(pathtoOutput, urltoOutput, jobnum, framenum, slavekey))
+        {
           fprintf(stderr, "Upload failed. Trying again in 10 seconds... (attempt %d of 10)\n", tries);
           tries++;
           sleep(10);
+        }
       return 1; // Upload failed after multiple tries
       // @FUTURE: Keep track of files that we were unable to upload, and upload them later
+    }
+}
 void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoTardir,char **pathtoJob, char **pathtoJobfile, char **urltoJobfile, char **urltoOutput,char **pathtoOutput, char **pathtoRenderOutput, char **pathtoOutdir)
+{
   // Variable Preparation
   char *jobdatapath;
    _distren_asprintf(&jobdatapath, "job%d", jobnum);
    _distren_asprintf(urltoTar, "http://data.distren.org/job%d/job.tar.gz", jobnum, jobnum); // Prepares URL to download from
    _distren_asprintf(urltoJobfile, "http://data.distren.org/job%d/job.blend", jobnum); // Prepares URL to download from
    _distren_asprintf(pathtoTar, "%s/%s/job.tar.gz", datadir, jobdatapath, jobnum); // Prepares destination to save to
    _distren_asprintf(pathtoTardir, "%s/%s/", datadir, jobdatapath); // Prepares destination to save to
    _distren_asprintf(pathtoJob, "%s/%s/", datadir, jobdatapath);
    _distren_asprintf(pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
    _distren_asprintf(urltoOutput, "http://distren.org/slaveUpload.php?jobkey=%d&framekey=%d",jobnum,framenum); // Prepares the URL where output is posted
    _distren_asprintf(pathtoRenderOutput, "%s/%s/output/job%d-frame#.%s", datadir, jobdatapath, jobnum, outputExt ); // Note: the # is for blender to put in framenum in output file
    _distren_asprintf(pathtoOutput, "%s/%s/output/job%d-frame%d.%s", datadir, jobdatapath, jobnum, framenum, outputExt ); // Note: the # is for blender to put in framenum in output file
    _distren_asprintf(pathtoOutdir, "%s/%s/output", datadir, jobdatapath);
    free(jobdatapath);
+}
 int checkUsername(char *username)
+{
   if(username == NULL || strcmp(username, "!username") == 0 )
+    {
      fprintf(stderr, "\nPlease ensure that your slave ID is present in distrenslave.conf, or use the -u flag to set a slave ID.\n");
@@ @@ -570,187 +571,191 @@ void *_web_myrealloc(void *ptr, size_t s @@
+}
 size_t _web_writememorycallback(void *ptr, size_t size, size_t nmemb, void *data)
+{
   size_t realsize = size * nmemb;
   struct _web_memorystruct *mem = (struct _web_memorystruct *)data;
   mem->memory = _web_myrealloc(mem->memory, mem->size + realsize + 1);
   if (mem->memory) {
     memcpy(&(mem->memory[mem->size]), ptr, realsize);
     mem->size += realsize;
     mem->memory[mem->size] = 0;
+  }
   return realsize;
+}
 struct _web_memorystruct _web_getrequest(char *url){
   // fprintf(stderr,"Preparing to get request at %s",url);
   CURL *curl;
   CURLcode res;
   struct _web_memorystruct chunk;
   chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
   chunk.size = 0;    /* no data at this point */
   curl = curl_easy_init();
   if(curl) {
     curl_easy_setopt(curl, CURLOPT_URL, url);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _web_writememorycallback);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
     curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
     res = curl_easy_perform(curl);
     curl_easy_cleanup(curl);
+  }
   /* we're done with libcurl, so clean it up */
   curl_global_cleanup();
   return chunk; // 0 is OK, 1 is 404 or other error
+}
 void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum){
   char *url;
   _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=finishframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(DEBUG)
   fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 void _web_resetframe(int slavekey, char *slavepass, int jobnum, int framenum){
   fprintf(stderr,"Resetting frame %d in job %d on server... ",framenum,jobnum);
   char *url;
   _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=resetframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(DEBUG)
   fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum){
   if(DEBUG)
     fprintf(stderr,"Marking frame %d started on server... ",framenum);
   char *url;
   _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=startframe&slavekey=%d&slavepass=%s&jobnum=%d&framenum=%d", slavekey, slavepass, jobnum, framenum);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(DEBUG)
   fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum){
   char *url;
   _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=getwork&slavekey=%d&slavepass=%s", slavekey, slavepass);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(!data.memory || !strcmp(data.memory,",")){
     fprintf(stderr,"*** No work available on server! In other news, really weird things are happening. Check it out. You shouldn't be seeing this.\n");
     return 0;
+  }
   else if(!strcmp(data.memory, "ERROR_BADKEY")){
     fprintf(stderr,"*** Slave %d does not exist!\n",slavekey);
     free(data.memory);
     return 0;
+  }
   else if(!strcmp(data.memory, "ERROR_NORENDERPOWER")){
     fprintf(stderr,"*** Render power not set! Please invoke distrensimpleslave -r to run the benchmark!\n",slavekey);
     free(data.memory);
     return 0;
+  }
   // Compare to PACKAGE_VERSION
   else{
     char *tmp;
     char *serverversion;
     tmp = strtok (data.memory,",,");
     if(tmp != NULL){ // make sure work is available
       *jobnum = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *framenum = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       serverversion = tmp;
       // @TODO: This should be called every time, not just on fail.
       if(strcmp(PACKAGE_VERSION,serverversion)){
         fprintf(stderr,"Your distren package is out of date! Please acquire a newer version. (%s local vs %s remote)\n", PACKAGE_VERSION, serverversion);
         return 0;
+      }
       if(DEBUG)
         fprintf(stderr,"Software versions: %s local vs %s remote\n", PACKAGE_VERSION, serverversion);
       free(data.memory);
       return 1;
+    }
     else
       return 0; // error
+  }
+}
 void _web_setrenderpower(int slavekey, char *slavepass, int renderpower){
   fprintf(stderr,"Setting render power on server... ");
   char *url;
   _distren_asprintf(&url,"http://distren.org/slave/act.php?mode=setrenderpower&slavekey=%d&slavepass=%s&renderpower=%d", slavekey, slavepass, renderpower);
   struct _web_memorystruct data = _web_getrequest(url);
   free(url);
   if(DEBUG)
   fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 int slaveBenchmark(char *datadir, int *benchmarkTime, int *renderPower){
   int ret;
   int frameToRender = 1;
   char *frame_str;
   _distren_asprintf(&frame_str, "%d", frameToRender); // Render frame 1
   char *output;
   _distren_asprintf(&output, "%s/benchmark#.jpg", datadir); // Where to save benchmark output
   char *realOutput;
   _distren_asprintf(&realOutput, "%s/benchmark%d.jpg", datadir, frameToRender); // Where to save benchmark output
   char *input;
   _distren_asprintf(&input, "%s/benchmark.blend", datadir); // Input file
   fprintf(stderr,"Downloading benchmark data...\n");
   curlget("http://data.distren.org/benchmark.blend", input); // Download to input file location
   char *command = "blender"; // @TODO: We currently expect this to be in PATH
   char *cmd[] = { command, "-b", input, "-o", output, "-f", frame_str, "-t", "0", (char *)NULL }; // arguments for blender
   // fprintf(stderr,"Preparing to execute command: %s -b %s -o %s -f %s\n", command, input, output, frame_str);
   fprintf(stderr,"Running benchmark...\n");
   long startTime;
   long endTime;
   time(&startTime);
   char buf[20];
   struct execio *testrem;
   size_t readlen;
   ret = execio_open(&testrem, command, cmd);
   if(ret)
+    {
       fprintf(stderr, "Error executing blender\n");
       return 1;
+    }
   buf[19] = '\0';
   while(!execio_read(testrem, buf, 19, &readlen))

0 comments (0 inline, 0 general)