DistRen Changeset - 7f610e2808f2 · protofusion repositories

Changeset - 7f610e2808f2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-03-23 00:23:20
e@ethanzonca.com

Fixed many memory leaks

3 files changed with 25 insertions and 8 deletions:

src/common/options.c

src/server/simpleslave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/common/options.c

➞

Show inline comments

@@ @@ -60,96 +60,98 @@ int options_init(int argc, char *argv[], @@
       case 'h':
 	fprintf(stderr, "libdistren common options\n\
 \n\
 \t-h\tShow this help.\n\
 \t-c <path>\tBasename for configuration files. For instance, if distrencommon.conf is located at /etc/distren/distrencommon.conf, set this option /etc/distren/distren . Default value: %s\n\
 \n", SYSCONFDIR "/distren");
 	return 2;
 	break;
       case 'c':
 	configfileprefix = strdup(optarg);
 	if(!configfileprefix)
 	  /* return is unnecessary here */
 	  fprintf(stderr, "OOM\n");
 	break;
       case ':':
 	fprintf(stderr, "Option -%c requires an argument\n", optopt);
 	return 1;
+      }
   /* restore optind for other people who use getopt */
   optind = 1;
   if(!configfileprefix
      && (configfileprefix = getenv("DISTREN_CONFIG_PREFIX")) )
+    {
       configfileprefix = strdup(configfileprefix);
       if(!configfileprefix)
+	{
 	  fprintf(stderr, "OOM\n");
 	  return 1;
+	}
+    }
   /* For those of you who don't know, the following is an example of concatenation of constant strings by the C compiler. Now, that doesn't mean you can do run-time string concatenation ;-)
      strdup is because someday configfile will be customizable via argv[]
   */
   if(!configfileprefix)
       configfileprefix = strdup(SYSCONFDIR);
   if(!configfileprefix)
+    {
       fprintf(stderr, "OOM\n");
       return 1;
+    }
   workingdir = distren_getcwd();
   if(!workingdir)
     fprintf(stderr, "Error finding working directory, I will not be able to return to it after reading the configuration files\n");
   if(chdir(configfileprefix))
     fprintf(stderr, "Unable to chdir(\"%s\") where I expected to find config files, expect failure\n", configfileprefix);
   free(configfileprefix);
   _distren_asprintf(&configfile, "%s%s.conf", PACKAGE, myname);
   if(!configfile)
+    {
       perror("blah");
       free(workingdir);
       return 1;
+    }
   tmp = distren_getcwd();
   fprintf(stderr, "using configuration file: ``%s'' (CWD=``%s'')\n", configfile, tmp ? tmp : "");
   free(tmp);
   /* initialize structs */
   *allopts = malloc(sizeof(struct options_common));
   if(!*allopts)
+    {
       perror("malloc");
       free(workingdir);
       free(configfile);
       return 1;
+    }
   memset(*allopts, '\0', sizeof(struct options_common));
   (*allopts)->data = malloc(sizeof(struct options_common_data));
   if(!(*allopts)->data)
+    {
       perror("malloc");
       free(workingdir);
       free(configfile);
       free(*allopts);
       return 1;
+    }
   memset((*allopts)->data, '\0', sizeof(struct options_common_data));
   (*allopts)->remoteio = malloc(sizeof(struct remoteio_opts));
   if(!(*allopts)->data)
+    {
       perror("malloc");
       free(workingdir);
       free(configfile);
       free((*allopts)->data);
       free(*allopts);
       return 1;
+    }
   memset((*allopts)->remoteio, '\0', sizeof(struct remoteio_opts));
   (*allopts)->remoteio->ssh_command = strdup("ssh");
   /** @TODO: check for NULL return above */

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -166,85 +166,99 @@ int main(int argc, char *argv[]) @@
         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,"Got data tarball\n");
           fprintf(stderr,"Got uncompressed data!\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
           fprintf(stderr,"Using existing uncompressed data %s...\n", pathtoJobfile);
           //fprintf(stderr,"Using existing tarball %s...\n", pathtoTar);
         /* // Commented for decompression
         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
             return 1;
+          }
+        }
         */
         /* ignore return because directory may exist already */
         fprintf(stderr,"Creating output directory %s\n", pathtoOutdir);
         mkdir(pathtoOutdir, 0700);
         fprintf(stderr,"Marking frame started on server... ");
         _web_startframe(slavekey, password, jobnum, framenum);
         /* Execute blender */
         fprintf(stderr,"Executing blender on file %s\n", pathtoJobfile);
         fprintf(stderr,"Directing output to file %s\n", pathtoOutput);
         if(exec_blender(pathtoJobfile, pathtoRenderOutput, framenum))
+          {
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.\n");
             _web_resetframe(slavekey, password, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
             return 1;
+          }
         free(pathtoJobfile);
         pathtoJobfile = NULL;
         struct stat buffer;
         int fstatus = stat(pathtoOutput, &buffer);
         if(fstatus == -1){
           fprintf(stderr,"*** %s doesn't exist! Scene may not have camera, or your blender installation is not working.\n", pathtoOutput);
           _web_resetframe(slavekey, password, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
           return 1;
+        }
         else{
           /* Post-execution */
           fprintf(stderr, "Finished frame %d in job %d, uploading...\n", framenum, jobnum);
           uploadOutput(pathtoOutput, urltoOutput, jobnum, framenum, slavekey); // @TODO: Handle return value
           free(urltoOutput);
           free(pathtoOutput);
           urltoOutput = NULL;
           pathtoOutput = NULL;
           // Tell the server that rendering and upload are complete
           _web_finishframe(slavekey, password, jobnum, framenum);
+        }
+      }
     else{
       fprintf(stderr,"Nothing to do. Idling...\n");
       sleep(300); // 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(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

@@ @@ -193,182 +193,185 @@ int curlpost(char *filename, char *url, @@
   curl_global_init(CURL_GLOBAL_ALL);
   /* jobnum field... */
    curl_formadd(&formpost,
                 &lastptr,
                 CURLFORM_COPYNAME, "jobnum",
                 CURLFORM_COPYCONTENTS, sjobnum, CURLFORM_END);
   /* framenum field... */
   curl_formadd(&formpost,
                &lastptr,
                CURLFORM_COPYNAME, "framenum",
                CURLFORM_COPYCONTENTS, sframenum, CURLFORM_END);
   /* slavekey field... */
   curl_formadd(&formpost,
                &lastptr,
                CURLFORM_COPYNAME, "slavekey",
                CURLFORM_COPYCONTENTS, sslavekey, CURLFORM_END);
   /* 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,
                CURLFORM_COPYNAME, "submit",
                CURLFORM_COPYCONTENTS, "send",
                CURLFORM_END);
   curl = curl_easy_init();
   headerlist = curl_slist_append(headerlist, buf);
   if(curl) {
     /* Setting the URL to get the post, and the contents of the post */
     curl_easy_setopt(curl, CURLOPT_URL, url);
     curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
     res = curl_easy_perform(curl);
     curl_easy_cleanup(curl);
     /* cleanup the formpost junk */
     curl_formfree(formpost);
     curl_slist_free_all (headerlist);
     free(sjobnum);
     free(sframenum);
     free(sslavekey);
+  }
   return res;
+}
 /** Logs the user into the server after ensuring that keys exist */
 int login_user(char *username)
+{
   // @TODO: Put some telnet-style auth code here unless this is obselete
   return 1; // success
+}
 /** Replaces wordtoreplace with replacewith in conffile (relative to SYSCONFDIR) */
 int conf_replace(char *conffile, char *wordtoreplace, char *replacewith){
   int maxlinelen = 120;
   char *fileOrig;
   char *fileRepl;
   _distren_asprintf(&fileOrig, "%s/%s", SYSCONFDIR, conffile);
   _distren_asprintf(&fileRepl, "%s%s.edited", SYSCONFDIR, conffile);
   char buffer[maxlinelen+2];
   char *buff_ptr, *find_ptr;
   FILE *fp1, *fp2;
   size_t find_len = strlen(wordtoreplace);
   fp1 = fopen(fileOrig,"r");
   fp2 = fopen(fileRepl,"w");
   if (fp1 ==NULL){
     fprintf(stderr, "%s doesn't exist\n",fileOrig);
     return 0;
+  }
   else if(fp2 ==NULL){
     fprintf(stderr, "Can't write a file to disk! Check permissions.\n");
     return 0;
+  }
   else{
     while(fgets(buffer,maxlinelen+2,fp1))
+      {
         buff_ptr = buffer;
         while ((find_ptr = strstr(buff_ptr,wordtoreplace)))
+        {
            while(buff_ptr < find_ptr)
              fputc((int)*buff_ptr++,fp2);
            fputs(replacewith,fp2);
            buff_ptr += find_len;
+         }
          fputs(buff_ptr,fp2);
+      }
     rename(fileRepl, fileOrig);
+  }
   fclose(fp2);
   fclose(fp1);
   fprintf(stderr,"Wrote conf file...\n");
 return 1; // Success
+}
 /* Executors */
 /** Executor function for Blender operations */
 int exec_blender(char *input, char *output, int frame)
+{
   int ret;
   char *frame_str;
   _distren_asprintf(&frame_str, "%i", frame);
   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);
   char buf[10];
   struct execio *testrem;
   size_t readlen;
   fprintf(stderr,"Executing: %s\n", frame_str);
   ret = execio_open(&testrem, command, cmd);
   buf[20] = '\0';
   while(!execio_read(testrem, buf, 20, &readlen))
+    {
       if(readlen > 20) {
         fprintf(stderr, "Something is terribly wrong!\n");
+       }
        buf[readlen] = '\0';
        fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
+  free(frame_str);
   return ret;
+}
 void xmlinit()
+{
   xmlInitParser();
   xmlXPathInit();
+}
 void xmlcleanup()
+{
   xmlCleanupParser();
+}
 /** Creates directories recursively */
 int distren_mkdir_recurse(char *dirname)
+{
   size_t counter;
   char *nextdir;
   nextdir = strdup(dirname);
   for(counter = 0; nextdir[counter]; counter ++)
+    {
       /** @TODO OS-portabalize the path-separators */
       if(nextdir[counter] == '/')
+        {
           nextdir[counter] = '\0';
           mkdir(nextdir, S_IRWXU | S_IRGRP | S_IROTH);
           nextdir[counter] = '/';
+        }
+    }
   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;
@@ @@ -633,99 +636,97 @@ static void *_web_myrealloc(void *ptr, s @@
 static void *_web_myrealloc(void *ptr, size_t size)
+{
   /* There might be a realloc() out there that doesn't like reallocing
      NULL pointers, so we take care of it here */
   if(ptr)
     return realloc(ptr, size);
   else
     return malloc(size);
+}
 static 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://dev.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);
   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://dev.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);
   fprintf(stderr,"%s\n", data.memory);
   if(data.memory)
     free(data.memory);
+}
 void _web_startframe(int slavekey, char *slavepass, int jobnum, int framenum){
   fprintf(stderr,"Marking frame %d started on server... ",framenum);
   char *url;
   _distren_asprintf(&url,"http://dev.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);
   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://dev.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!\n");
     return 0;
+  }
   else if(!strcmp(data.memory, "ERROR_BADKEY")){
@@ @@ -784,58 +785,58 @@ int slaveBenchmark(char *datadir, int *b @@
   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[10];
   struct execio *testrem;
   size_t readlen;
   ret = execio_open(&testrem, command, cmd);
   buf[20] = '\0';
   while(!execio_read(testrem, buf, 20, &readlen))
+    {
       if(readlen > 20) {
         fprintf(stderr, "Something is terribly wrong!\n");
+       }
        buf[readlen] = '\0';
        fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   time(&endTime);
   struct stat buffer;
   int ostatus = stat(realOutput, &buffer);
   if(ostatus == -1){
     ret = 1; // Return error if output wasn't generated
+  }
   else
     remove(output);
   free(frame_str);
   free(input);
   free(output);
   *benchmarkTime = abs(difftime(startTime,endTime));
   float tmp = *benchmarkTime;
   tmp = (1/tmp) * 50000;
   *renderPower = (int)tmp;
   free(realOutput);
   free(frame_str);
   free(input);
   free(output);
   return ret;
+}

0 comments (0 inline, 0 general)