DistRen Changeset - 257ea2fc6baf · protofusion repositories

Changeset - 257ea2fc6baf

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 15 years ago 2010-07-22 21:34:58
ohnobinki@ohnopublishing.net

Fixed up the client's main() function which yet doesn't get anything done ;-).

3 files changed with 123 insertions and 55 deletions:

src/client/distren.c

120

src/client/distren.h

src/client/libdistren_job.c

0 comments (0 inline, 0 general)

src/client/distren.c

➞

Show inline comments

@@ @@ -18,143 +18,211 @@ @@
 */
 /* This code is meant to submit files to the distren server(s). Let's say server for now. And let's state file purpose in each file just so we don't get screwed up! */
 /* Ideas for php-side stuff:
+ *
  * PHP adds the users... has captcha and email confirmation wth a pseudo-random number that
  * the user must enter on the site. Apache should be running mod_peruser for safety, and I'm
  * thinking zserver2 for web serving for convenience...
  */
 #include "common/config.h"
 #include "distren.h"
 #include <stdio.h> /* sprintf, printf */
 #include <stdlib.h> /* malloc, free */
 #include <unistd.h> /* getopt */
 #include <confuse.h>
 #include <string.h> // for strcat
 int main_opt_set(const char *name, char **dst, const char *src);
 int main(int argc, char *argv[])
+{
   int doLogin = 0;
   short dologin;
   short printinfo;
   short lazy;
   char *input;
   char *output;
-  char *jobid;
+  char *joburi;
   char *username;
   char *password;
   char curopt;
   distren_t distren;
   distren_job_t distren_job;
   dologin = 0;
   printinfo = 0;
   lazy = 1;
   input = NULL;
   output = NULL;
   joburi = NULL;
-  while(-1 != (curopt = getopt(argc, argv, "i:o:u:p:h")))
+  while(-1 != (curopt = getopt(argc, argv, "di:j:o:u:p:h")))
+    {
-      if(curopt == ':')
+      switch(curopt)
+	{
 	case ':':
 	  fprintf(stderr, "-%c: is missing an argument\n", optopt);
 	  return 1;
+	}
       else if(curopt == '?')
 	case '?':
 	  fprintf(stderr, "-%c: invalid option specified\n", optopt);
 	  return 1;
 	case 'h':
 	  fprintf(stderr, "Usage: %s [-u <username>] [-p <password>] ...\n", argv[0]);
 	  fprintf(stderr, "\t-i\tSpecifies an input file to submit to the server.\n\
 \t-o\tSpecifies the name that should be given to a job retrieved from the server.\n\
 \t-j\tSpecifies the job handle of a job to view information about or retrieve.\n\
 \t-d\tDisplays information about the job specified with -j or uploaded by -i.\n\
 \t-h\tShows this help message.\n");
 	  /*
 	   * don't return here because options_init will have an
 	   * overall options help page
 	   */
 	  break;
 	case 'u':
 	  main_opt_set("-u", &username, optarg);
 	  dologin = 1;
 	  break;
 	case 'p':
 	  main_opt_set("-p", &password, optarg);
 	  dologin = 1;
 	  break;
 	case 'i':
 	  if(joburi)
+	{
-	  fprintf(stderr, "-%c: invalid option specified\n", optopt);
+	      fprintf(stderr, "You may not specify both -i and -j; -j must refer to an existing job URL and -i will create a new job and thus retrieve its URL.\n");
 	  return 1;
+	}
       else if(curopt == 'h')
 	  main_opt_set("-i", &input, optarg);
 	  break;
 	case 'o':
 	  main_opt_set("-o", &output, optarg);
 	  break;
 	case 'j':
 	  if(input)
+	{
 	  fprintf(stderr, "Usage: %s -i <inputfile> -o <outputfile> [ -u <username> -p <password> ]\n", argv[0]);
 	  fprintf(stderr, "\t-i\tSpecifies the input file\n\
 \t-o\tSpecifies the output file\n\
 \t-h\tShows this help message\n");
 	  //  don't return here because options_init will have an overall
 	  //  options help page
 	      fprintf(stderr, "You may not specify both -j and -i; -i is submitting a new jobs whose URL cannot be known before it is submitted\n");
 	      return 1;
+	}
       else if(curopt == 'u') {
         doLogin = 1;
         username = strdup(optarg);
+      }
       else if(curopt == 'p') {
         doLogin = 1;
         password = strdup(optarg);
 	  main_opt_set("-j", &joburi, optarg);
 	  break;
 	case 'd':
 	  printinfo = 1;
 	  break;
+      }
       else if(curopt == 'i')
 	 //  TODO: is strdup good or bad? what about
 	 //  the idea that all libs should allow plugging different
 	 //  malloc/free implementations in?
 	input = strdup(optarg);
       else if(curopt == 'o')
 	output = strdup(optarg);
+    }
      // give this error after the general arguments parsing so that
      // the general help from options_init can have effect
   if(!username || !password){
     fprintf(stderr, "Username and password must be specified");
   if(!username || !password)
+    {
       fprintf(stderr, "Username and password must be specified:\n");
       if(!username)
 	fprintf(stderr, "\tyou did not specify a username\n");
       if(!password)
 	fprintf(stderr, "\tyou did not specify a password\n");
     return 1;
+  }
   if(doLogin == 1){
   if(dologin)
+    {
     fprintf(stderr, "Trying username and password on server...");
     return 0;
       fprintf(stderr, "STUB\n");
       lazy = 0;
+  }
   if(!input
      || !output)
   if(distren_init_mf(&distren, &malloc, &free))
+    {
-      fprintf(stderr, "Input and output files must be specified\n");
+      fprintf(stderr, "error initializing the distren handle\n");
       return 1;
+    }
   fprintf(stderr, "reading from %s\nwriting to %s\n", input, output);
   if(distren_init_mf(&distren, &malloc, &free))
   if(input)
+    {
       fprintf(stderr, "error initializing distren handle\n");
       return 1;
+    }
   if(distren_submit_file(distren, &distren_job, input))
+    {
       fprintf(stderr, "error submitting file\n");
       return 1;
+    }
-  if(distren_job_getid(distren_job, &jobid))
+      if(distren_job_geturi(distren_job, &joburi))
+    {
-      fprintf(stderr, "error retrieving job id\n");
+	  fprintf(stderr, "error retrieving joburi\n");
       return 1;
+    }
   fprintf(stdout, "jobid: %s\n", jobid);
       lazy = 0;
       fprintf(stdout, "joburi: %s\n", joburi);
+    }
   if(output)
+    {
   if(distren_job_retrieve_file(distren_job, output))
+    {
       fprintf(stderr, "error retrieving output file\n");
       return 1;
+    }
   // if these following lines fail, it'll be reported as a core dump ;-)
       lazy = 0;
+    }
   /*
    * if these following lines fail, it'll be reported as a core dump
    * ;-)
    */
   if(distren_job)
   distren_job_free(distren_job);
   distren_free(distren);
   if(lazy)
     fprintf(stderr, "Performed no action\n");
  return 0;
 };
   /**
    * A helper for main() that will print a warning about overriding
    * specifying an argument multiple times and properly handle options
    * overriding eachother.
+   *
    * Before calling main_opt_set() for the first time, the caller must
    * preset *dst to NULL.
+   *
    * @param name something to identify the particular option to the user.
    * @param dst the poiner to where a newly allocated string's pointer should be stored.
    * @param src the value specified by the user.
    */
 int main_opt_set(const char *name, char **dst, const char *src)
+{
   if(*dst)
+    {
       fprintf(stderr, "warning: You have specified %s before, setting it to %s\n", name, src);
       free(*dst);
+    }
   *dst = strdup(src);
   return 0;
+}

src/client/distren.h

➞

Show inline comments

@@ @@ -37,49 +37,49 @@ typedef struct distren_job *distren_job_ @@
  Initialize a libdistren handle. In the spirit of respecting client programs' choices,
  this initialization function allows malloc() and free() compatible function pointers
  to be passed.
 */
 int distren_init_mf(distren_t *handle, distren_malloc_t mymalloc, distren_free_t myfree);
 /**
  Initializes a libdistren handle using the system malloc() and free() implementation.
 */
 int distren_init(distren_t *handle);
 /**
  Submits a file to distren.
  @param job must not refer to a valid job.
  @TODO create a stream-based interface
 */
 int distren_submit_file(distren_t handle, distren_job_t *job, const char *filename);
 /**
    Retrieve a job-ID that can be used to refer to the job after the client's process has recycled. Currently, this will be the only way to retrieve a job handle (a distren_job_t) and, consequently, the only way to retrieve a finished render.
    A job ID is representable using a character string. Hopefully, they will be kept at a reasonably small length. It should be made up of alphanumeric characters so as to be useful in most situations.
    @param jobid This will be set to a string allocated by the specified malloc implementation
    @param job The distren_job_t from which to retrieve a jobid
 */
-int distren_job_getid(distren_job_t job, char **jobid);
+int distren_job_geturi(distren_job_t job, char **joburi);
 /**
    Retrieves a tarball of a rendering's result.
    @param outfile Filename to save the result to
  */
 int distren_job_retrieve_file(distren_job_t job, const char *outfile);
 /*
  TODO: extraction of a job-ID, retrieving job handle by job-ID, getting information
  for a job handle, retrieving results of a job, callbacks for progress (i.e., job_is_finished callback)
  -- threads?
+ -- threads? -- noooo!
 */
 /**
  Destroys and frees a job handle
 */
 int distren_job_free(distren_job_t job);
 /**
  Destroys and frees a libdistren handle
 */
 int distren_free(distren_t handle);
 #endif

src/client/libdistren_job.c

➞

Show inline comments

@@ @@ -7,44 +7,44 @@ @@
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
   Implementation of distren_job_* functions from distren.h.
  */
 #include "common/config.h"
 #include "libdistren.h"
 /**
    @todo Stub
  */
-int distren_job_getid(distren_job_t job, char **jobid)
+int distren_job_geturi(distren_job_t job, char **joburi)
+{
   return 1;
+}
 /**
    @todo Stub
  */
 int distren_job_retrieve_file(distren_job_t job, const char *outfile)
+{
   return 1;
+}
 /**
    @todo Stub
  */
 int distren_job_free(distren_job_t job)
+{
   return 1;
+}

0 comments (0 inline, 0 general)