DistRen Changeset - e7e0e5775ace · protofusion repositories

Changeset - e7e0e5775ace

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-10-10 19:26:09
ohnobinki@ohnopublishing.net

reindent, reformat

1 file changed with 59 insertions and 55 deletions:

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -19,8 +19,8 @@ @@
  */
 #include "protocol.h"
 #include "options.h" // Confuse, etc.
 #include "slavefuncs.h" // Slave functions
 #include "options.h" /* Confuse, etc. */
 #include "slavefuncs.h" /* Slave functions */
 #include "asprintf.h"
 #include "remoteio.h"
@@ @@ -36,12 +36,12 @@ int main(int argc, char *argv[]) @@
 int counter;
 /* Parses arguments, skips if there are no args */
 for(counter=0; counter<argc; counter++){
   if(strcmp(argv[counter], "-h") == 0) {
   for(counter = 0; counter < argc; counter ++)
     if(strcmp(argv[counter], "-h") == 0)
+      {
     fprintf(stderr, "Usage: distrenslave [option] <username> <emailaddr>\nStarts a distren slave\n\t-h\tshow this help\n\t-c\tregisters a user with [username] and [emailaddr] \n");
     return 2;
+  }
+}
 if(argc>1 && (strcmp("-c", argv[1]) == 0))
+  {
@@ @@ -92,63 +92,65 @@ username = NULL; @@
 options_init(argc,argv,&my_cfg, myopts, "slave", &commonopts);
 /* End option getter */
 software_updatecheck(datadir); // Should be run every day-ish, if the slave is constantly running.
   /* Should _not_ be run every day-ish if the slave is constantly running. */
   /* software_updatecheck(datadir); */
 /* Notifies the user if there is no username in the conf file */
-if(username == NULL || strcmp(username, "!username") == 0 ){
+  if(username == NULL || strcmp(username, "!username") == 0 )
   fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
+}
 else if( username != NULL || strcmp(username,"!username") != 0 ){
   else
     if( username != NULL || strcmp(username, "!username") != 0 )
+      {
   // Logs ya in:
   if(login_user(username) == 1){
     fprintf(stderr,"You should now be logged into distren.\n");
+  }
   else{
 	else
+	  {
     fprintf(stderr,"Login failed. I have no clue why. Sorry.\n");
     return 0;
+  }
+}
 else{
     else
+      {
   fprintf(stderr,"Something is terribly wrong!");
+}
 /* Code-filled Variables  */
 int jobnum;          // The job number that we're currently working
 int framenum;        // @TODO: Remotio should fill this
   int jobnum;          /* The job number that we're currently working */
   int framenum;        /* @TODO: Remotio should fill this */
 int gotframe = 0;        // set this to 1 after data for a job is received from the server
 int busy = 0;        // Client business 1=busy 0=idle
   int gotframe = 0;    /* set this to 1 after data for a job is received from the server */
   int busy = 0;        /* Client business 1=busy 0=idle */
 char *urltoTar;      // Full URL to the server-side location of job#.tgz
 char *pathtoTar;     // Full path to the location of the job#.tgz
   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 *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
   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 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 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 = remoteio_read(jobnum); /* Set framenum from remoteio */
   framenum = 0;
   fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
@@ @@ -168,19 +170,17 @@ if(gotframe ==1) @@
   struct stat buffer;
   int fstatus = stat(pathtoJobfile, &buffer);
   // If stat'ing the jobfile shows that the jobfile doesn't exist, we'll download it.
   if(fstatus == -1){
     // Downloads the Tar @TODO: add progress bar
     if( curlget(urltoTar, pathtoTar) == 0){
       /* If stat'ing the jobfile shows that the jobfile doesn't exist, we'll download it. */
       if(fstatus == -1)
+	{
 	  /* Downloads the Tar @TODO: add progress bar */
 	  if( curlget(urltoTar, pathtoTar) == 0)
       fprintf(stderr, "File downloaded without errors\n");
+    }
     else{
 	  else
       fprintf(stderr, "Download tar from server failed. Either the server is down, or the job hosting system is screwed up.\nContact admin@protofusion.org and include this message.\nGoodbye. Better luck next time.\n");
+    }
+  }
   else{
       else
     fprintf(stderr, "Using cached job file...\n");
+  }
   _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @TODO: free() */
   mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
@@ @@ -190,32 +190,36 @@ if(gotframe ==1) @@
   system(tarcmd);
   free(tarcmd);
   // Parses a job's XML file, puts data in the myjob struct
   if(xml2distrenjob(&myjob, pathtoXml) == 0){
       /* 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");
     distrenjob_free(&myjob); // Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails
 	  /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */
 	  distrenjob_free(&myjob);
+  }
   else{
       else
+	{
     fprintf(stderr,"I think the XML craziness may have failed, so I'll terminate just for fun.\n");
     return 1;
+  }
   /* Variable-fillers which require XML */
   outputExt = myjob->output_format; /* @TODO: FIXME! */
   _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); // Prepares the path to the jobfile
       outputExt = myjob->output_format; /* @TODO: FIXME! <-- NEVER! */
       /* Prepares the path to the jobfile */
       _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt );
   /** Series of IF's for jobtype based on xml content */
   if(1==1){
    exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D
+  }
   // When blender is finished, run this...
       /** Series of ifs for jobtype based on xml content */
       if(1 == 1)
 	exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
       /* 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
   tell_the_server(DISTREN_REQUEST_DONEFRAME); // Tells the server that it's finished rendering this frame
       curlpost(pathtoOutput, urltoOutput); /* uploads (HTML POST) the output at outputpath to the server at outputurl */
       tell_the_server(DISTREN_REQUEST_DONEFRAME); /* Tells the server that it's finished rendering this frame */
   busy=0;
   // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
       /* Slave now becomes idle, doesn't need to tell the server anything, ssh handles this. */
+}

0 comments (0 inline, 0 general)