DistRen Changeset - 46e0bef8b7e0 · protofusion repositories

Changeset - 46e0bef8b7e0

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-09 15:48:16

finished createJobFromXML() and reCreateQueueFromXML()

1 file changed with 24 insertions and 2 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -514,9 +514,29 @@ int makeSlaveDataXML(struct distrenjob * @@
 // extracts data from the xml created by above function and creates a job from it
 // it returns a pointer to the created job
-void createJobFromXML(int job_number)
+struct distrenjob *createJobFromXML(int job_number)
+{
   xmlDocPtr doc;
   xmlNodePtr cur;
   char *file_name;
   struct distrenjob *distrenjob;
   distrenjob_new(&distrenjob);
   _distren_asprintf(&file_name, "stor/job%d/job_info.xml", job_number);
   doc = xmlParseFile(file_name);
   cur = xmlDocGetRootElement(doc);
   distrenjob->name = (char*)xmlGetProp(cur, (xmlChar*)"name");
   distrenjob->submitter = (char*)xmlGetProp(cur, (xmlChar*)"submitter");
   distrenjob->priority = atoi((char*)xmlGetProp(cur, (xmlChar*)"priority"));
   cur = cur->xmlChildrenNode;
   distrenjob->width = atoi((char*)xmlGetProp(cur, (xmlChar*)"width"));
   distrenjob->height = atoi((char*)xmlGetProp(cur, (xmlChar*)"number"));
   return distrenjob;
+}
 // returns 1 if successful
@@ @@ -614,6 +634,7 @@ int reCreateQueueFromXML(struct distrenj @@
   struct distrenjob *holder; // holds the job that "was" after head, so that the new struct can be inserted after head
   struct distrenjob *job; // job to be added
   xmlChar *tmp;
   int job_num;
   if(current == NULL) // base case, if element doesn't exist then don't do anything
     return 0;
@@ @@ -623,7 +644,8 @@ int reCreateQueueFromXML(struct distrenj @@
   // now actual work is done, adding the job to the front of the queue
   holder = head->next; // initialize holder
   tmp = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); // get job number
   // job = another function that reads data from xml for that job, prepares the job, and returns a pointer to the job
   job_num = atoi((char*)tmp);
   job = createJobFromXML(job_num);
   xmlFree(tmp); // free xml char (that holds the job number)
   // insert job at front of the queue

0 comments (0 inline, 0 general)