DistRen Changeset - 2e6b26cb909d · protofusion repositories

Changeset - 2e6b26cb909d

Parent rev.

Child rev.

[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:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -127,33 +127,33 @@ char *pathtoTar; // Full path to the @@
 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
   */
@@ @@ -179,13 +179,13 @@ if(gotframe ==1) @@
+    }
+  }
   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);

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -132,23 +132,23 @@ 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) {

0 comments (0 inline, 0 general)