DistRen Changeset - 45bf3be8fb93 · protofusion repositories

Changeset - 45bf3be8fb93

Parent rev.

Child rev.

[Not reviewed]

default

0 3 1

Nathan Brink (binki) - 16 years ago 2009-08-16 19:52:36
ohnobinki@ohnopublishing.net

initial XML parsing for distrenjob

4 files changed with 200 insertions and 7 deletions:

src/server/Makefile.am

src/server/blendjob.h

src/server/distrend.c

src/server/distrenjob.c

151

0 comments (0 inline, 0 general)

src/server/Makefile.am

➞

Show inline comments

 COMMON_SOURCES =  slavefuncs.c slavefuncs.h blendjob.h
+COMMON_SOURCES =  slavefuncs.c slavefuncs.h distrenjob.c blendjob.h
 bin_PROGRAMS = distrend distrenslave
 distrend_SOURCES = distrend.c ${COMMON_SOURCES}
 distrend_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistrencommon.la
 distrend_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common
 distrenslave_SOURCES = slave.c ${COMMON_SOURCES}
 distrenslave_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistrencommon.la
 distrenslave_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common

src/server/blendjob.h

➞

Show inline comments

@@ @@ -16,51 +16,77 @@ @@
   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_BLENDJOB_H
 #define _DISTREN_BLENDJOB_H
 /**
    This file stores the blendjob and frameset structs and prototypes for some functions to manipulate/use these.
  */
 #include <time.h> /* clock_t */
+#include <time.h> /* clock_t, time_t */
 typedef unsigned int jobnum_t;
 /**
    Stores Blender Job Info
 */
 struct blendjob {
   struct blendjob *next; /*< next will be NULL unless if there is another blendjob */
   char *name;
   char *submitter;
   char *email;
+  char *email; /*< This should be looked up based on the value of submitter, not stored in this struct */
   jobnum_t jobnum;
   int priority;  // 1 is lowest, 10 is highest, 0 means the job is done
-  int percent_done;
+  float percent_done;
   int completed_frames; // number of completed frames for stats/etc
   int assigned_frames; // number of assigned frames (that are not yet completed) for stats/etc
   int total_frames; // how many frames are in the animation for stats/etc (unassigned frames)
   int avg_render_time; // average seconds it took to render a frame
   unsigned int time_remaining; // estimated seconds remaining till render is complete (up to 49, 710 days)
 							   // we can have the client computer convert it into days, hours, etc if they wish to view it
   time_t avg_render_time; // average seconds it took to render a frame
   time_t time_remaining; /*< estimated seconds remaining till render is complete (up to 49, 710 days) */
   struct frameset *frameset;
 };
 /**
    Frameset Structure
 */
 struct frameset {
   int num; /*< frame number to render */
   char slave_name; /*< user that frame is assigned to */
   int status; /*< status of frame, 0= unassigned, 1= taken, 2= done */
   clock_t start_time; /*< time the frame was started */
   int time_to_render; /*< the total seconds it took to render the frame */
 }; /* Frameset array is generated by status_report_generator() */
 /*
 related functions
 */
 /**
    @param distrenjob the address where we will store the pointer of a malloc()ed
    distrenjob struct.
    @param pathtoxml filename/pathname of the xml file to be read into a blendjob struct
  */
 int xml2distrenjob(struct blendjob **distrenjob, char *pathtoxml);
 /**
    support function for xml2distrenjob() to help cleaning up a
    struct blendjob when it is incompletely initialized.
    Also acts as a general-purpose struct distrenjob free()er ;-)
  */
 void distrenjob_free(struct blendjob **distrenjob);
 /**
    initializes an empty, pointless struct distrenjob. This
    DOES run malloc() for you. It could return nonzero on error,
    but there are no errors to have yet (except for nomem). This
    sets all char* to NULL.
  */
 int distrenjob_new(struct blendjob **distrenjob);
 #endif

src/server/distrend.c

➞

Show inline comments

@@ @@ -45,24 +45,25 @@ @@
+ *
  *  Please edit my ramblings if you please,
  *  --ethanzonca
+ *
  */
 #include "execio.h"
 #include "options.h"
 #include "blendjob.h"
 #include "protocol.h"
 #include "slavefuncs.h"
 #include <confuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h> /* getopt */
 #include <time.h>
@@ @@ -479,33 +480,48 @@ int distrend_do_config(int argc, char *a @@
       CFG_SIMPLE_INT("port", NULL),
       CFG_END()
     };
   cfg_opt_t myopts[] =
+    {
       CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
           myopts_listen,
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_END()
     };
   struct blendjob *distrenjob;
   int tmp;
   xmlinit();
   /*
    * test xml2distrenjob()
    */
   tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");
   if(tmp)
     fprintf(stderr, "xml2distrenjob() returned %d. Try to cd to distren/doc if you want to test out the xml2distrenjob() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n", tmp);
   else
     fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
   fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
   xmlcleanup();
   return 0;
+}
 int distrend_config_free(struct distrend_config *config)
+{
   options_free(config->options);
   free(config);
   return 0;
+}
 // End non-working framework?
 int main(int argc, char *argv[])

src/server/distrenjob.c

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright 2009 Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
   This file is a part of DistRen.
   DistRen is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   DistRen is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "blendjob.h"
 #include "slavefuncs.h"
 #include "asprintf.h"
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 void distrenjob_free(struct blendjob **distrenjob)
+{
   struct blendjob *dj;
   dj = *distrenjob;
   xmlFree(dj->name);
   xmlFree(dj->submitter);
   xmlFree(dj->email);
   free(dj);
   *distrenjob = NULL;
+}
 int distrenjob_new(struct blendjob **distrenjob)
+{
   struct blendjob *dj;
   dj = malloc(sizeof(struct blendjob));
   if(!dj)
+    {
       /* try to catch code that doesn't respect return values
        faster: */
       *distrenjob = NULL;
       return 1;
+    }
   *distrenjob = dj;
   dj->next = NULL;
   dj->name = (char *)NULL;
   dj->submitter = (char *)NULL;
   dj->email = (char *)NULL;
   dj->jobnum = 0; /*< @todo there should be a central jobnum allocator and a way to save the maximum jobnumber allocated */
   dj->priority = 0;
   dj->percent_done = 0;
   dj->completed_frames = 0;
   dj->assigned_frames = 0;
   dj->avg_render_time = 0;
   dj->time_remaining = (unsigned int)-1;
   dj->frameset = (struct frameset *)NULL; /*< @todo does frameset need to be initialized here? */
   return 0;
+}
 /**
    writes struct from xml
 */
 int xml2distrenjob(struct blendjob **distrenjob, char *pathtoxml)
+{
   struct blendjob *dj;
   xmlDocPtr xmldoc;
   xmlNodePtr xmlnode;
   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 *)"/distren/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 = _distren_asprintf((char **)&xmlchar, "/distren/submitters/submitter[attribute::name=\"%s\"]", dj->submitter);
   if(tmp <= 0
      || !xmlchar)
+    {
       fprintf(stderr, "error using _distren_asprintf\n");
       distrenjob_free(distrenjob);
       return 6;
+    }
   xmlnode = xml_quickxpath(xmlxpathcontext, xmlchar);
   free(xmlchar);
   dj->email = (char *)xmlGetProp(xmlnode, (xmlChar *)"email");
   if(!dj->email)
+    {
       fprintf(stderr, "error getting email for user ``%s'' from ``%s''\n",
 	      dj->submitter, pathtoxml);
       distrenjob_free(distrenjob);
       return 7;
+    }
   xmlXPathFreeContext(xmlxpathcontext);
   xmlFreeDoc(xmldoc);
   return 0;
+}

0 comments (0 inline, 0 general)