Master

*-Add calls to remotio

 -Write more meat into the pseudo-code main() to pull everything together

 -Write a stub for getting info from the tarball/validifying the tarball. Read distren-job.xml, a file in the tarball, to find out 1. which rendering system to use (that system, e.g. blender/povray, can read more specifics, such as name of file to pass to blender and frames. Options common between different systems will be handled in common as best as possible)

 -Write a stub for publishing file and constructing job description so that the job can be shared

*-Other XML-writing/reading

*-charsets: the program should operate in UTF-8. This is partially required by libxml2's (and XML's) usage of UTF-8. We want the program's internal charset to be UTF-8 and figure out if we need w_char/whatever to fulfill UTF-8. I don't believe we do... mabye we just need a declaration that al data stored must be in UTF-8 format.

 -rename some struct members and variables to be more program-agnostic and more sensible (e.g., no blender-specific stuff)

Slave

 -Fix current bugs

*-Add calls to remoteio, once it works or even before it works

*-Other XML-writing/reading

=-Make code more flexible for different types of jobs and operating systems (such as paths, libs, etc)

 -Add code to allow pausing/resuming of the slave (including a running blender process)

 -Add a threads variable for software that doesn't support threads (blender takes care of this by itself)

Options

 -Rewrite some stuff, try to make it simpler

x-Move server and client confuse code into their individual files, rather than in the common file. -- note: there wasn't any client code in options.c. There was the ``server'' section. That section is passed multiple times and provides information to remoteio on how to connect to servers

 -Review all confuse interfacing

 -Push patch for relative includes in confuse to the confuse developers

B-Expand execio() to support stderr

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)

struct distrenjob *myjob; // Structure to hold data gathered from the XML file

// If the slave is getting job info...

if(gotframe ==1)

  {

    /* @TODO: fix these remoteio_read's */

    framenum = remoteio_read(jobnum); // Set framenum from remoteio

    char *tarcmd;

    char *outdir;

    char *jobdatapath;

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

    /**

       Variable Preparation

       @todo find where to free() all of these

    */

    _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/job%d/output/", 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

    //  Download the data if it isn't  present. (prevents re-downloading for same-job frames) @TODO: Delete old job data

      struct stat buffer;

      int fstatus = stat(pathtoJobfile, &buffer);

      if(fstatus != -1){

              fprintf(stderr, "Using cached job file...\n");

      }

    _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @todo free() */

    mkdir("/tmp/distren", 0750); /* @TODO: This is a tad unix-specific... */

    mkdir(outdir, 0750);

    system(tarcmd);

    free(tarcmd);

    // Grabs data from the XML file, throws it 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 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 */

    _distren_asprintf(&pathtoOutput, "%s/job%d/output/frame%d.%s", datadir, jobnum, framenum, outputExt ); // Prepares the path to the jobfile

     exec_blender(&myjob, pathtoJobfile, pathtoOutput, framenum); // @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;

      fprintf(stderr, "XPath resolution failed for ``%s'' in ``%s'' (``%s'')\n", path, xpathctxt->doc->name, xpathctxt->doc->URL);

      return (xmlNodePtr)NULL;

    }

  toreturn = *(xmlxpathobjptr->nodesetval->nodeTab);

  xmlXPathFreeObject(xmlxpathobjptr);

  return toreturn;

}

void tell_the_server(char *stuff){

}

/** Function referenced by curlget() to write data to disk. */

size_t curl_writetodisk(void *ptr, size_t size, size_t nmemb, FILE *stream)

 {

    return fwrite(ptr, size, nmemb, stream);

  }

int curlget(char *url, char *out){

  CURL *curl;

  CURLcode res;

  FILE *outfile;

  curl = curl_easy_init();

  if(curl) {

	outfile = fopen(out, "w"); // Open where we're writing to

  curl_easy_setopt(curl, CURLOPT_URL, url);

  curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);

  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_writetodisk); // this MUST be set for win32 compat.

  res = curl_easy_perform(curl);

  curl_easy_cleanup(curl);

  }

}

/** Posts a file to a url with cUrl */

int curlpost(char *filename, char *url){

  char *targetname = "uploadedfile"; // Name of the target in the php file

  CURL *curl;

  CURLcode res;

  struct curl_httppost *formpost=NULL;

  struct curl_httppost *lastptr=NULL;

  struct curl_slist *headerlist=NULL;

  static const char buf[] = "Expect:";