DistRen Changeset - 0f9242c3fef6 · protofusion repositories

Changeset - 0f9242c3fef6

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 15 years ago 2010-09-13 20:22:56
ohnobinki@ohnopublishing.net

Properly allocate and manipulate the outputExt variable for simpleslave, fixes a segfault.

3 files changed with 9 insertions and 5 deletions:

src/server/simpleslave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -165,75 +165,77 @@ if(updateConf){ @@
   // 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;     /* 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;
   outputExt = NULL;
   // @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...");
   // Main loop
   while(!quit)
+    {
     // request work
     if(DEBUG)
       fprintf(stderr,"Requesting work from %s...\n", hostname);
     haveWork = _web_getwork(slavekey, password, &jobnum, &framenum, &xres, &yres, outputExt);
+    haveWork = _web_getwork(slavekey, password, &jobnum, &framenum, &xres, &yres, &outputExt);
     /* If we got a frame */
     if(haveWork)
+      {
         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);
@@ @@ -305,41 +307,42 @@ if(updateConf){ @@
           free(urltoOutput);
           free(pathtoOutput);
           urltoOutput = NULL;
           pathtoOutput = NULL;
           // Tell the server that rendering and upload are complete
           _web_finishframe(slavekey, password, jobnum, framenum);
+        }
+      }
     else{
       if(DEBUG)
         fprintf(stderr,"No work to do. Idling...\n");
       else
         fprintf(stderr,".");
       sleep(60); // Poll every 300 seconds @TODO: remove polling
+    }
     // @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old
     if(1 == 0)
+      {
         // Note: individual frames are already deleted after uploading,
         // except for ones that couldn't be uploaded
         delete_jobdata(jobnum, datadir);
+      }
     free(outputExt);
+  }
   free(my_cfg);
   free(outputExt);
   free(datadir);
   free(urltoTar);
   free(pathtoTar);
   free(pathtoTardir);
   free(pathtoJob);
   free(pathtoJobfile);
   free(urltoJobfile);
   free(urltoOutput);
   free(pathtoRenderOutput);
   free(pathtoOutdir);
   fprintf(stderr,"Goodbye!\n");
   return 0;
+}

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -651,49 +651,50 @@ void _web_resetframe(int slavekey, char @@
   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);
+}
 /** @TODO: Needs to get xres, yres, outpuext */
 int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum, int *xres, int *yres, char *outputext){
 int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum, int *xres, int *yres, char **outputext)
+{
   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! Check your slave ID, or register your slave on distren.org\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");
     free(data.memory);
     return 0;
+  }
   // Compare to PACKAGE_VERSION
   else{
     char *tmp;
     char *serverversion;
@@ @@ -703,49 +704,49 @@ int _web_getwork(int slavekey, char *sla @@
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *framenum = atoi(tmp); // Grab framenum
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       serverversion = tmp;
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *xres = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       *yres = atoi(tmp);
       tmp = strtok (NULL, ",");
       if(tmp == NULL)
         return 0; // no work
       outputext = tmp;
+      *outputext = strdup(tmp);
       if(DEBUG)
         fprintf(stderr,"GETWORK Debug output - Job: %d | Frame: %d | Xres: %d | Yres: %d | Outformat: %s\n", *jobnum, *framenum, *xres, *yres, outputext);
       // @FIXME: Setting outputext and serverversion = temp; will this cause issues as these are pointers to parts of the original temp var?
       // @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... ");

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -52,31 +52,31 @@ int downloadTar(char *url, char *destina @@
 int uploadOutput(char *pathtoOutput, char *urltoOutput, int jobnum, int framenum, int slavekey);
 int unpackJob(char *outdir, char *pathtoTar);
 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);
 int checkUsername(char *username);
 void slaveTest();
 /* Standard slave */
 void finishframe(struct remoteio *rem, int jobnum, int framenum);
 void resetframe(struct remoteio *rem, int jobnum, int framenum);
 void startframe(struct remoteio *rem, int jobnum, int framenum);
 int greet_server(struct remoteio *rem);
 int getwork(struct remoteio *rem, int *jobnum, int *framenum);
 void setrenderpower(struct remoteio *rem, int renderpower);
 int getrenderpower(struct remoteio *rem);
 int checkslaveversion(struct remoteio *rem);
 /* Simple slave */
 struct _web_memorystruct;
 void *_web_myrealloc(void *ptr, size_t size);
 size_t _web_writememorycallback(void *ptr, size_t size, size_t nmemb, void *data);
 struct _web_memorystruct _web_getrequest(char *url);
 void _web_finishframe(int slavekey, char *slavepass, int jobnum, int framenum);
 void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum);
 void _web_resetframe(int slavekey, char *slavepass, int jobnum, int framenum);
 int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum, int *xres, int *yres, char *outputext);
+int _web_getwork(int slavekey, char *slavepass, int *jobnum, int *framenum, int *xres, int *yres, char **outputext);
 void _web_setrenderpower(int slavekey, char *slavepass, int renderpower);
 int slaveBenchmark(char *datadir, int *benchmarkTime, int *renderPower);
 #endif

0 comments (0 inline, 0 general)