DistRen Changeset - bcef1af0e63b · protofusion repositories

Changeset - bcef1af0e63b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-12-11 11:38:21
ez@ethanzonca.com

Warning-laden remotio additions

1 file changed with 5 insertions and 3 deletions:

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -70,101 +70,103 @@ int main(int argc, char *argv[]) @@
     CFG_SIMPLE_STR("datadir", &datadir),
     CFG_END()
   };
   struct options_common *commonopts;
   username = NULL;
   options_init(argc, argv, &my_cfg, myopts, "slave", &commonopts);
   /* Notifies the user if there no username in .conf */
   if(username == NULL || strcmp(username, "!username") == 0 )
     fprintf(stderr, "\nPlease ensure that your username is present in distrenslave.conf\n");
   else
     if( username != NULL || strcmp(username, "!username") != 0 )
+      {
 	// Log in the user
 	if(login_user(username) == 1){
 	  fprintf(stderr, "You should now be logged into distren.\n");
+	}
 	else
+	  {
 	    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, "Please check your distrenslave.conf, it appears to be incorrectly formatted.\n");
+      }
   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 */
   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 */
   struct remoteio *comm_slave; /* Structures for remotio */
   struct remoteio_opts *comm_slaveoptions;
   struct remoteio_opts *comm_slaveopts = {"ssh"};
   struct execio *remoteExec;
   struct remoteio *comm_slave = {0, comm_slaveopts, remoteExec}; /* Structures for remotio */
   fprintf(stderr,"Connecting to server...\n");
-  remoteio_open(&comm_slave, comm_slaveoptions, "protofusion" );
+  remoteio_open(&comm_slave, comm_slaveopts, "protofusion" );
   int haveWork = 0;
   while(1)
+    {
     // request work
     fprintf(stderr,"Requesting work...\n");
     sendSignal(comm_slave, DISTREN_REQUEST_GETWORK);
     /* If we got a frame */
     if(haveWork)
+      {
         fprintf(stderr,"Got work from server...\n");
         /* @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 */
         //framenum = remoteio_read(jobnum); /* Set framenum from remoteio */
         fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
         // 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);
         // 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){
               fprintf(stderr, "Job data retrieved successfully\n");
               free(urltoTar);
+            }
             else {
               fprintf(stderr, "Downloading job data from %s failed. Check your network connection.\n",urltoTar);
               return 1; // Eventually make a retry loop
+            }
+          }
         else
           fprintf(stderr, "Using cached job file...\n");

0 comments (0 inline, 0 general)