# HG changeset patch
# User ethanzonca@localhost.localdomain
# Date 2009-11-23 23:35:25
# Node ID daac9f402eabc79a925feec6c7a709575da4a604
# Parent  278632d244b7cb28cf0c8e462e5b59d95203e1c4

Freed some vars, other edits

diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
   for(counter = 0; counter < argc; counter ++)
     if(strcmp(argv[counter], "-h") == 0)
       {
-	fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-h\tshow this help\n"); /* <username> <emailaddr> \t-c\tregisters a user with [username] and [emailaddr] \n */
+	fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-h\tshow this help\n");
 	return 2;
       }
 
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
   /* Notifies the user if there no username in .conf */
   if(username == NULL || strcmp(username, "!username") == 0 )
-    fprintf(stderr, "\nYou didn't register!\nPlease register on the DistRen website.\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+    fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
   else 
     if( username != NULL || strcmp(username, "!username") != 0 )
       {
@@ -69,22 +69,18 @@ int main(int argc, char *argv[])
 	}
 	else
 	  {
-	    fprintf(stderr, "Login failed.\n");
+	    fprintf(stderr, "Login failed, please check your username. If you have not registered, please do so on the DistRen website.\n");
 	    return 0;
 	  }
       }
     else
       {
-	fprintf(stderr, "Something is terribly wrong!");
+	fprintf(stderr, "Please check your distrenslave.conf, it appears to be incorrectly formatted.\n");
       }
 
 
-
-  /* Code-filled Variables  */
-  int jobnum = 0;          /* The job number that we're currently working */
-  int framenum = 0;        /* @TODO: Remotio should fill this */
-
-  int busy = 0;        /* Client business 1=busy 0=idle */
+  int jobnum = 0;
+  int framenum = 0;
 
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
@@ -101,13 +97,14 @@ int main(int argc, char *argv[])
 
   struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
 
-  int cont = 1;
-  int framesInLocalQueue = 0;
+  int haveWork = 0;
 
-  while(cont)
+  while(1)
     {
+
+    tell_the_server(0); // Give me some work!
     /* If we got a frame */
-    if(framesInLocalQueue > 0)
+    if(haveWork)
       {
         /* @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 */
@@ -115,27 +112,29 @@ int main(int argc, char *argv[])
 
         fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
 
-        /**
-           Variable Preparation
-           @todo find where to free() all of these
-        */
+        // Variable Preparation
         _distren_asprintf(&jobdatapath, "job%d", jobnum);
         _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz", jobnum); // Prepares URL to download from
         _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to
         _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile
         _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted
         _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml", datadir, jobnum ); // Prepares the path to the job's XML file
+        free(jobdatapath);
 
-        // Download the job tar if it isn't  present.
+        // Prepare to download the job tar if it isn't  present
         struct stat buffer;
         int fstatus = stat(pathtoJobfile, &buffer);
         if(fstatus == -1)
           {
-            /* Download the Tar */
-            if( curlget(urltoTar, pathtoTar) == 0)
+            // Download the Tar
+            if( curlget(urltoTar, pathtoTar) == 0){
               fprintf(stderr, "Job data retrieved successfully\n");
-            else
+              free(urltoTar);
+            }
+            else {
               fprintf(stderr, "Downloading job data from server failed. Check your network connection.\n");
+              return 1; // for now
+            }
           }
         else
           fprintf(stderr, "Using cached job file...\n");
@@ -147,11 +146,14 @@ int main(int argc, char *argv[])
         _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
         system(tarcmd);
         free(tarcmd);
+        free(pathtoTar);
+        free(outdir);
 
         /* Parses a job's XML file, puts data in the myjob struct */
         if(xml2distrenjob(&myjob, pathtoXml) == 0)
           {
             fprintf(stderr, "Well, the XML craziness may have worked. Maybe. \n");
+            free(pathtoXml);
 
             /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */
             distrenjob_free(&myjob);
@@ -166,17 +168,20 @@ int main(int argc, char *argv[])
         outputExt = myjob->output_format; /* @TODO: FIXME! <-- I WILL! */
         /* Prepares the path to the jobfile */
         _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt );
+        free(outputExt);
 
         /* Execute blender */
         exec_blender(pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
+        free(pathtoJobfile);
 
         /* When blender is finished, run this... */
         fprintf(stderr, "Finished frame %d in job %d, uploading...", framenum, jobnum);
         curlpost(pathtoOutput, urltoOutput); /* uploads (HTML POST) the output at outputpath to the server at outputurl */
+        free(urltoOutput);
+        free(pathtoOutput);
+
         tell_the_server(DISTREN_REQUEST_DONEFRAME); /* Tells the server that it's done rendering, and upload is done */
-        busy = 0;
         /* Slave now becomes idle, doesn't need to tell the server anything, ssh handles this. */
-        framesInLocalQueue--;
       }
     else
       fprintf(stderr,"Nothing to do. Idling...\n");
@@ -184,6 +189,9 @@ int main(int argc, char *argv[])
     if(1 == 0){
       delete_jobdata(jobnum, datadir);
     }
+
+
+
     sleep(5); // Poll 5 seconds. @TODO: Remove all polling
   }
   return 0;