DistRen Changeset - ec90f545efc5 · protofusion repositories

Changeset - ec90f545efc5

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 15 years ago 2010-10-09 11:25:13
ohnobinki@ohnopublishing.net

Fix random warnings.

2 files changed with 10 insertions and 0 deletions:

src/server/distrenjob.c

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -132,192 +132,197 @@ int distrenjob_unserialize(struct distre @@
   xmlChar *xmlchar;
   xmlXPathContextPtr xmlxpathcontext;
   int tmp;
   if(distrenjob_new(distrenjob))
     return 1;
   dj = *distrenjob;
   xmldoc = xmlReadFile(pathtoxml, NULL, XML_PARSE_PEDANTIC);
   if(!xmldoc)
+    {
       /**
 	 @todo are we able to depend on libxml2's printed errors or
 	 channel them into syslog output (eventually)? Currently,
 	 this error is repetitious of a libxml2 error printed on stderr
 	 for us.
        */
       fprintf(stderr, "error reading XML file ``%s''\n", pathtoxml);
       distrenjob_free(distrenjob);
       return 2;
+    }
   xmlxpathcontext = xmlXPathNewContext(xmldoc);
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job");
   if(!xmlnode)
+    {
       distrenjob_free(distrenjob);
       return 3;
+    }
   /*< @todo should we use xmlChar everywhere too? */
   dj->name = (char *)xmlGetProp(xmlnode, (xmlChar *)"name");
   if(!dj->name)
+    {
       distrenjob_free(distrenjob);
       return 4;
+    }
   /*< @todo validation needs to be done on usernames. e.g., currently, they shouldn't contain the '"' char  */
   dj->submitter = (char *)xmlGetProp(xmlnode, (xmlChar *)"submitter");
   if(!dj->submitter)
+    {
       distrenjob_free(distrenjob);
       return 5;
+    }
   tmp = _distrenjob_xml_readuint(xmlnode, (xmlChar *)"priority", &dj->priority);
   if(tmp)
+    {
       distrenjob_free(distrenjob);
       return 6;
+    }
   dj->output_format = (char *)xmlGetProp(xmlnode, (xmlChar *)"output_format");
   if(!dj->output_format)
+    {
       distrenjob_free(distrenjob);
       return 6;
+    }
   tmp = _distrenjob_xml_readuint(xmlnode, (xmlChar *)"jobnum", &dj->jobnum);
   if(tmp)
+    {
       distrenjob_free(distrenjob);
       return 7;
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/resolution");
   tmp = _distrenjob_xml_readuint(xmlnode, (xmlChar *)"width"   , &dj->width   );
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"height"  , &dj->height  );
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/video");
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"start_frame", &start_frame);
   tmp += _distrenjob_xml_readuint(xmlnode, (xmlChar *)"end_frame", &end_frame);
   if(tmp)
+    {
       fprintf(stderr, "distrenjob_unserialize(): error reading integer values from ``%s''\n",
 	      pathtoxml);
       distrenjob_free(distrenjob);
       return 8;
+    }
   /**
      total_render_time and watchdog stuff doesn't need error
      checking, just good defaults
   */
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/stats");
   dj->total_render_time = 0;
   xmlchar = xmlGetProp(xmlnode, (xmlChar *)"total_render_time");
   if(xmlchar)
+    {
       /*
        * even though GCC says this is implicitly declared, POSIX
        * requires that time.h declare this function. Thus, we don't
        * have to worry about the warning.
        */
       if(strptime((char *)xmlchar, "%D %T", &tm))
 	dj->total_render_time = mktime(&tm);
       xmlFree(xmlchar);
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, (xmlChar *)"/job/watchdog");
   dj->watchdog_forgiveness = 3600;
   tmp =_distrenjob_xml_readuint(xmlnode, (xmlChar *)"forgiveness", &dj->watchdog_forgiveness);
   if(tmp)
     fprintf(stderr, "distrenjob_unserialize(): warning: watchdog forgiveness is unspecified in ``%s'', defaulting to 3600\n", pathtoxml);
   xmlXPathFreeContext(xmlxpathcontext);
   xmlFreeDoc(xmldoc);
   /**
      reconstruct the frameset
   */
   dj->total_frames = end_frame - start_frame + 1;
 #ifndef NDEBUG
   fprintf(stderr, "distrenjob_unserialize(): restoring %d frames\n", dj->total_frames);
 #endif
   dj->frameset = malloc(sizeof(struct frameset) * dj->total_frames);
   if(!dj->frameset)
+    {
       fprintf(stderr, "OOM!\n");
       distrenjob_free(distrenjob);
       return 9;
+    }
   fs = dj->frameset;
   for(counter = start_frame; counter <= end_frame; counter ++)
+    {
       fs->num = counter;
       fs->status = FRAMESETSTATUS_UNASSIGNED; /*< @todo job partial completion and resumption support */
       fs ++;
+    }
 #ifndef NDEBUG
   fprintf(stderr, "distrenjob_unserialize(): finished loading ``%s''\n", pathtoxml);
 #endif
   return 0;
+}
 int distrenjob_serialize(struct distrenjob *job, char *outfile)
+{
   xmlTextWriterPtr writer;
   char *tmp;
   char *tmpfile;
   int tmprtn;
   /**
      transactional FS access for POSIX systems...
      (probably not implemented correctly)
    */
   _distren_asprintf(&tmpfile, "%s_", outfile);
   /* create xml document at the location tmp with no compression */
   writer = xmlNewTextWriterFilename(tmpfile, 0);
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   /**
      write distrenjob element and add its attributes */
   xmlTextWriterStartElement(writer, (xmlChar*)"job");
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"name", (xmlChar*)job->name);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"submitter", (xmlChar*)job->submitter);
   _distren_asprintf(&tmp, "%d", job->priority);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"priority", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", job->jobnum);
   xmlTextWriterWriteAttribute(writer, (xmlChar *)"jobnum", (xmlChar *)tmp);
   free(tmp);
   xmlTextWriterWriteAttribute(writer, (xmlChar *)"output_format", (xmlChar *)job->output_format);
   /**
      write resolution element and add its attributes */
   xmlTextWriterStartElement(writer, (xmlChar*)"resolution");
   _distren_asprintf(&tmp, "%d", job->width);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"width", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", job->height);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"height", (xmlChar*)tmp);
   free(tmp);
   xmlTextWriterEndElement(writer);
   /**
      write video element and its attributes */
   xmlTextWriterStartElement(writer, (xmlChar*)"video");
   _distren_asprintf(&tmp, "%d", job->frameset[0].num);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"start_frame", (xmlChar*)tmp);
   free(tmp);
   _distren_asprintf(&tmp, "%d", job->frameset[ job->total_frames - 1 ].num);

src/server/slave.c

➞

Show inline comments

@@ @@ -141,321 +141,326 @@ int main(int argc, char *argv[]) @@
   if(!server)
+    {
       fprintf(stderr, "server not set\n");
       return 1;
+    }
   if(!username)
+    {
       fprintf(stderr, "username not set\n");
       return 1;
+    }
   if(!password)
+    {
       fprintf(stderr, "password not set\n");
       return 1;
+    }
   if(!hostname)
+    {
       fprintf(stderr, "hostname not set\n");
       return 1;
+    }
   /* Notifies the user if there no username in .conf */
   if(checkUsername(username))
     return 1;
   if(!strncmp(password, "!password",10))
+    {
       fprintf(stderr, "You haven't specified a password. Please edit distrenslave.conf!\n");
       return 1;
+    }
   // Variables needed for main loop
   int jobnum = 0;
   int framenum = 0;
   int xres = 0;
   int yres = 0;
   int slavekey = atoi(username); // @TODO: Make this more friendly
   char *urltoTar;      /* Full URL to the server-side location of job#.tgz */
   char *pathtoTar;     /* Full path to the location of the job#.tgz */
   char *pathtoTardir;
   char *urltoOutput;   /* Full URL where output is posted */
   char *pathtoOutput;  /* Full path to the output (rendered) file */
   char *pathtoOutdir;  /* Full path to output directory */
   char *pathtoRenderOutput;  /* Contains blender framenum placeholder */
   char *urltoJobfile; /* No longer used, url to .blend on server */
   char *pathtoJob;     /* Full path to job data folder */
   char *pathtoJobfile; /* Full path to the job's main file */
   char *outputExt;     /* Output Extension (e.g., JPG) */
   int haveWork = 0;
   int benchmarkTime = 0;
   int renderPower = 0;
   slave_state.copyright_done = 0;
   slave_state.expectlen = 0;
   slave_state.quit = 0;
   fprintf(stderr, "Connecting to server...\n");
   if(remoteio_open_server(&slave_state.rem, commonopts->remoteio, &distren_slave_remoteio_read_handle, &slave_state, &distren_slave_remoteio_close_handle, server))
+    {
       fprintf(stderr, "Error connecting to server; exiting\n");
       return 1;
+    }
   greet_server(slave_state.rem);
   fprintf(stderr,"\nDistRen Slave Pre-Alpha %s\n- Experimental build: Use at your own risk!\n\n", PACKAGE_VERSION);
   // @TODO: add call to function to force recalc if $render_power == ""
   if(runBenchmark)
+    {
       if(slaveBenchmark(datadir, &benchmarkTime, &renderPower))
+        {
           fprintf(stderr,"Benchmark failed! Exiting.\n");
           return 1;
+        }
       else
+        {
           fprintf(stderr,"Benchmark successful, time taken was %d seconds, giving you a render power of %d.\n",
                   benchmarkTime, renderPower);
           _web_setrenderpower(slavekey, password, renderPower);
           return 0;
+        }
+    }
   if(!DEBUG)
     fprintf(stderr, "Running..");
   // Main loop
   while(!slave_state.quit)
+    {
       outputExt = NULL;
       multiio_poll(multiio, 15000);
       if(slave_state.quit)
 	break;
     // request work
     fprintf(stderr, "Waiting...\n");
     haveWork = getwork(slave_state.rem, &jobnum, &framenum);
     /* 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 */
         // outputExt = remotio)read(outputExt); /* Set output extension from remotio */
 	outputExt = strdup("jpg");
         if(DEBUG)
           fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
         prepareJobPaths(jobnum, framenum, outputExt, datadir, &urltoTar, &pathtoTar,&pathtoTardir,&pathtoJob, &pathtoJobfile, &urltoJobfile, &urltoOutput, &pathtoOutput, &pathtoRenderOutput, &pathtoOutdir);
         int dlret = downloadTar(urltoTar, pathtoTar);
         if(dlret == 0)
           fprintf(stderr,"Data retrieved successfully!\n");
         else if(dlret == 3){
           resetframe(slave_state.rem, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
           return 0; // ouput dir doesn't exist
+        }
         else
           if(DEBUG)
             fprintf(stderr,"Using existing tarball %s...\n", pathtoTar);
         // Decompress tarball
         struct stat jbuffer;
         int jstatus = stat(pathtoTar, &jbuffer);
         if(jstatus == -1){
           if(DEBUG)
             fprintf(stderr,"Main job file does not exist, extracting...\n");
           // If error unpacking tarball
           if(unpackJob(pathtoJob, pathtoTar)){
             resetframe(slave_state.rem, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
             fprintf(stderr,"Error decompressing tarball! Exiting.\n");
             return 1;
+          }
+        }
         /* ignore return because directory may exist already */
         if(DEBUG)
           fprintf(stderr,"Creating output directory %s\n", pathtoOutdir);
         mkdir(pathtoOutdir, 0700);
         if(DEBUG)
           fprintf(stderr,"Marking frame started on server... ");
         _web_startframe(slavekey, password, jobnum, framenum);
         /* Execute blender */
         if(DEBUG){
           fprintf(stderr,"Executing blender on file %s\n", pathtoJobfile);
           fprintf(stderr,"Directing output to file %s\n", pathtoOutput);
+        }
         /* Execute blender */
         if(exec_blender(pathtoJobfile, pathtoOutput, outputExt, xres, yres, framenum))
+          {
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.\n");
             resetframe(slave_state.rem, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
             return 1;
+          }
         free(pathtoJobfile);
         pathtoJobfile = NULL;
         struct stat buffer;
         int fstatus = stat(pathtoOutput, &buffer);
         if(fstatus == -1){
           fprintf(stderr,"*** %s doesn't exist! Scene may not have camera, or your blender installation is not working.\n", pathtoOutput);
           resetframe(slave_state.rem, jobnum, framenum);  // Unassign the frame on the server so other slaves can render it
           return 1;
+        }
         else{
           /* Post-execution */
           if(DEBUG)
             fprintf(stderr, "Finished frame %d in job %d, uploading...\n", framenum, jobnum);
           else
             fprintf(stderr,"Finished frame.\n");
           uploadOutput(pathtoOutput, urltoOutput, jobnum, framenum, slavekey); // @TODO: Handle return value
           free(urltoOutput);
           free(pathtoOutput);
           urltoOutput = NULL;
           pathtoOutput = NULL;
           // Tell the server that rendering and upload are complete of "jobjum.framenum"
           finishframe(slave_state.rem, jobnum, framenum);
   free(urltoTar);
   free(pathtoTar);
   free(pathtoTardir);
   free(pathtoJob);
   free(pathtoJobfile);
   free(urltoJobfile);
   free(urltoOutput);
   free(pathtoRenderOutput);
   free(pathtoOutdir);
+        }
+     }
     else{
       if(DEBUG)
         fprintf(stderr,"Nothing to do. Idling...\n");
       else
         fprintf(stderr,".");
       /**
 	 to prevent infinite loops from burning CPU, we just sleep(1) ;-)
       */
       sleep(1);
+    }
     /* @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old */
     if(1 == 0)
+      {
         // Note: individual frames are already deleted after uploading,
         // except for ones that couldn't be uploaded
         delete_jobdata(jobnum, datadir);
+      }
     free(outputExt);
     sleep(5); // Poll 5 seconds. @TODO: Remove all polling
+  }
   fprintf(stderr, "Quitting...\n");
   free(my_cfg);
   free(datadir);
   fprintf(stderr, "Goodbye!\n");
   return 0;
+}
 static void distren_slave_remoteio_close_handle(void *blah, void *data)
+{
   struct slave_state *slave_state = (struct slave_state *)data;
   fprintf(stderr, "Lost connection to server\n");
   slave_state->quit = 1;
+}
 static size_t distren_slave_remoteio_read_handle(struct remoteio *rem,
 						 void *blah,
 						 void *buf,
 						 size_t len,
 						 void *data)
+{
   struct slave_state *slave_state = (struct slave_state *)data;
   struct distren_request *req, *my_req;
   void *req_data, *my_req_data;
   size_t to_return;
   size_t counter;
   fprintf(stderr, "expected to eat %d bytes\n", len);
   /* to_return shall record how much of buf we've eaten already */
   to_return = 0;
   if(!slave_state->copyright_done)
+    {
       putchar('\n');
       /* we have to flush through data until we hit a newline */
       for(counter = 0;
 	  counter + slave_state->expectlen < 256 && counter < len && ((char *)buf)[counter] != '\n';
 	  counter ++)
+	{
 	  putchar(((char *)buf)[counter]);
+	}
       slave_state->expectlen += counter - 1;
       if(slave_state->expectlen == 256)
+	{
 	  fprintf(stderr, "\nThe server's greeting is too long. Maybe it speaks a foreign language\n");
 	  slave_state->quit = 1;
+	}
       if(counter < len && ((char *)buf)[counter] == '\n')
+	{
 	  putchar('\n');
 	  counter ++;
 	  slave_state->expectlen = 0;
 	  slave_state->copyright_done = 1;
 	  to_return += counter;
 	  buf += counter;
 	  len -= counter;
+	}
       if(!slave_state->copyright_done)
 	return to_return;
+    }
   while(1)
+    {
       /* if we haven't read a full header yet: */
       if(!slave_state->expectlen)
+	{
 	  if(len < sizeof(struct distren_request))
 	    return to_return;
 	  /* figure out how much we need to read in before we can get anywhere */
 	  if(distren_request_new_fromdata(&req, buf, len))
+	    {
 	      fprintf(stderr, "Failing to interpret data from server, exiting\n");
 	      slave_state->quit = 1;
 	      return to_return;
+	    }
 	  slave_state->expectlen = sizeof(struct distren_request) + req->len;
 	  distren_request_free(req);
+	}
       if(slave_state->expectlen
 	    && slave_state->expectlen <= len)
+	{
 	  distren_request_new_fromdata(&req, buf, len);
 	  req_data = buf + sizeof(struct distren_request);
 	  switch((enum distren_request_type)req->type)
+	    {

0 comments (0 inline, 0 general)