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

@@ @@ -183,12 +183,14 @@ if(updateConf){ @@
   /* @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");
@@ @@ -209,13 +211,13 @@ if(updateConf){ @@
   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)
@@ @@ -323,16 +325,17 @@ if(updateConf){ @@
     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);

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -669,13 +669,14 @@ void _web_startframe(int slavekey, char @@
     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,",")){
@@ @@ -721,13 +722,13 @@ int _web_getwork(int slavekey, char *sla @@
         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.

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ 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)