Changeset - 84f81c551688
[Not reviewed]
default
0 3 0
ethanzonca - 16 years ago 2009-10-10 17:18:28

Some moving, killed threads var for now
3 files changed with 14 insertions and 17 deletions:
0 comments (0 inline, 0 general)
src/server/slave.c
Show inline comments
 
@@ -109,51 +109,48 @@ else if( username != NULL || strcmp(user
 
  }
 
}
 
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 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 *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)
 

	
 
int threads = sysconf(_SC_NPROCESSORS_ONLN); // Equals the number of currently online processors
 
// FOR Win32: int threads = sysinfo.dwNumberOfProcessors;
 

	
 
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(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 = 0;
 
  //framenum = remoteio_read(jobnum); // Set framenum from remoteio
 
  framenum = 0;
 

	
 
  char *tarcmd;
 
  char *outdir;
 
  char *jobdatapath;
 

	
 
  fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum);
 

	
 
  /**
 
@@ -189,47 +186,38 @@ if(gotframe ==1)
 
  mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */
 
  mkdir(outdir, 0750);
 

	
 
  _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */
 
  system(tarcmd);
 
  free(tarcmd);
 

	
 
  // 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
 
  }
 
  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
 

	
 

	
 
  /** Series of IF's for jobtype based on xml content */
 
  if(1==1){
 
   exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum, threads); // @TODO: This warning should be fixed :D
 
  }
 

	
 
  // Consider placing the following in the exec_blender() function
 
  while(busy == 1){
 
    tell_the_server(DISTREN_REQUEST_PROGRESS);
 
      fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
 
      sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
 
  }
 
  busy = 2;
 
  // busy = 1; // @TODO: When done rendering, set this.
 
   exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: This warning should be fixed :D
 
  }
 
  // When blender is finished, run this...
 
  if(busy==2){
 
    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
 
    busy=0;
 
    // Slave now becomes idle, doesn't need to tell the server anything, ssh handles this.
 

	
 
  }
 

	
 

	
 
  return 0;
 
}
src/server/slavefuncs.c
Show inline comments
 
@@ -390,70 +390,79 @@ int conf_replace(char *username){
 
      {
 
          buff_ptr = buffer;
 
          while ((find_ptr = strstr(buff_ptr,text2find)))
 
          {
 
          while(buff_ptr < find_ptr)
 
          	fputc((int)*buff_ptr++,fp2);
 
          fputs(text2repl,fp2);
 
          buff_ptr += find_len;
 
          }
 
          fputs(buff_ptr,fp2);
 
      }
 
    rename(fileRepl, fileOrig);
 
  }
 
  fclose(fp2);
 
  fclose(fp1);
 
  fprintf(stderr,"Wrote conf file...\n");
 
return 1; // Success
 
}
 

	
 

	
 
/* Executors */
 

	
 

	
 
/** Executor function for Blender operations */
 
void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame, int threads)
 
void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame)
 
{
 
  int ret;
 
  char *frame_str;
 

	
 
  /* start execio code */
 
  char *command = "blender"; // @TODO: append .exe if win32?
 

	
 
  char *cmd[] = { command, "-b", "-o", output, input, "-f", frame_str, (char *)NULL };
 

	
 
  char buf[10];
 
  struct execio *testrem;
 
  size_t readlen;
 

	
 
  _distren_asprintf(&frame_str, "%i", frame);
 

	
 
  ret = execio_open(&testrem, command, cmd); // This path will be absolute for testing, @TODO: should be relative to install on production
 
  buf[9] = '\0';
 
  while(!execio_read(testrem, buf, 9, &readlen))
 
  	    {
 
  	      if(readlen > 9) {
 
  		fprintf(stderr, "Something is terribly wrong!\n");
 
  	      }
 
  	      buf[readlen] = '\0';
 
  	      fprintf(stderr, "read \"%s\"\n", buf);
 
  	    }
 
  	execio_close(testrem);
 
  /* end execio code */
 

	
 
  	if(ret == 1){
 
  		fprintf(stderr,"Error starting Blender. Check your install.\n");
 
  	}
 
  	else{
 
  		fprintf(stderr,"Blender at least started nicely, we don't know if it rendered anything though.\n");
 
  	}
 
  	// Consider placing the following in the exec_blender() function
 
  	while(busy){
 
  	  tell_the_server(DISTREN_REQUEST_PROGRESS);
 
  	    fprintf(stderr, "Rendering frame %d in job %d...",framenum,jobnum);
 
  	    sleep(5); // or not... this should be more event-driven, but should still give a heartbeat to the server
 
  	}
 

	
 

	
 
}
 

	
 
void xmlinit()
 
{
 
  xmlInitParser();
 
  xmlXPathInit();
 
}
 

	
 
void xmlcleanup()
 
{
 
  xmlCleanupParser();
 
}
src/server/slavefuncs.h
Show inline comments
 
@@ -15,29 +15,29 @@
 

	
 
  You should have received a copy of the GNU Affero General Public License
 
  along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 
*/
 

	
 
#ifndef _DISTREN_SLAVEFUNCS_H
 
#define _DISTREN_SLAVEFUNCS_H
 

	
 
#include "distrenjob.h"
 

	
 
#include <libxml/xpath.h>
 
#include <stdio.h>
 

	
 
xmlNodePtr xml_quickxpath(xmlXPathContextPtr xpathctxt, xmlChar *path);
 
int software_updatecheck();
 
void tell_the_server(int stuff);
 
int delete_jobdata(int jobnum, char *datadir);
 
size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream);
 
int curlget(char *url, char *out);
 
int curlpost(char *filename, char *url);
 
int ssh_keygen();
 
int register_user(char *username, char *email);
 
int login_user(char *username);
 
int conf_replace(char *username);
 
void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame, int threads);
 
void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame);
 
void xmlinit();
 
void xmlcleanup();
 

	
 
#endif
0 comments (0 inline, 0 general)