- partial update of serializer
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@756 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
09268f7fd4
commit
8894e31222
6 changed files with 316 additions and 44 deletions
|
@ -198,6 +198,25 @@ void XMLSerializer::fill_schedulables(xmlNodePtr schedulables_node, const Histor
|
|||
}
|
||||
}
|
||||
|
||||
void XMLSerializer::clear_history(History& hist)
|
||||
{
|
||||
/*
|
||||
const Environment& env = hist.get_last_environment();
|
||||
|
||||
const Environment::Processes& pvect = env.get_processes();
|
||||
typedef std::vector<Process*>::const_iterator proc_iterator;
|
||||
|
||||
proc_iterator iter = pvect.begin();
|
||||
proc_iterator end = pvect.end();
|
||||
while(iter!=end)
|
||||
{
|
||||
xvisit.from_process(*(*iter));
|
||||
pvect.
|
||||
iter = pvect.begin();
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void XMLSerializer::read_doc(xmlDocPtr doc, XMLSerializerFactory& fact)
|
||||
{
|
||||
/*
|
||||
|
@ -211,13 +230,13 @@ void XMLSerializer::read_doc(xmlDocPtr doc, XMLSerializerFactory& fact)
|
|||
throw SerializerError("Reading Error: xml doc is empty.");
|
||||
}
|
||||
|
||||
cout << "ROOT: " << root->name << endl;
|
||||
// cout << "ROOT: " << root->name << endl;
|
||||
|
||||
xmlNodePtr cur;
|
||||
cur = root->children;
|
||||
while(cur!=NULL)
|
||||
{
|
||||
cout << "NODE: " << cur->name << endl;
|
||||
// cout << "NODE: " << cur->name << endl;
|
||||
|
||||
Glib::ustring name((const char *)cur->name);
|
||||
if(name=="resources")
|
||||
|
@ -239,25 +258,25 @@ XMLSerializerFactory::Parameters* read_properties(xmlAttrPtr prop)
|
|||
|
||||
XMLSerializerFactory::Parameters* par=new XMLSerializerFactory::Parameters();
|
||||
while (prop != NULL) {
|
||||
// cout << "PROP: " << prop->name;
|
||||
// // cout << "PROP: " << prop->name;
|
||||
|
||||
if(prop->children && xmlNodeIsText(prop->children)){
|
||||
xmlChar *key = xmlNodeGetContent (prop->children);
|
||||
// xmlChar *key = xmlNodeListGetString(doc, prop->children, 1);
|
||||
if(key!=NULL)
|
||||
{
|
||||
// cout << " VALUE: " << key;
|
||||
// // cout << " VALUE: " << key;
|
||||
std::pair<Glib::ustring, Glib::ustring> key_value(Glib::ustring((const char *)prop->name), Glib::ustring((const char *)key));
|
||||
par->insert(key_value);
|
||||
// c.insert(typename Cont::value_type(new_key, pos->second));
|
||||
cout << " pair PROP: " << key_value.first << " VALUE: " << key_value.second << endl;
|
||||
// cout << " pair PROP: " << key_value.first << " VALUE: " << key_value.second << endl;
|
||||
|
||||
xmlFree(key);
|
||||
}
|
||||
else
|
||||
cout << " !VALUE IS NULL! ";
|
||||
// else
|
||||
// cout << " !VALUE IS NULL! ";
|
||||
}
|
||||
cout << endl;
|
||||
// cout << endl;
|
||||
prop = prop->next;
|
||||
}
|
||||
return par;
|
||||
|
@ -272,7 +291,7 @@ void XMLSerializer::read_resources(xmlNodePtr resources_node, XMLSerializerFacto
|
|||
Glib::ustring node_name((const char *)cur->name);
|
||||
if(node_name=="resource")
|
||||
{
|
||||
cout << "NODE: " << cur->name << endl;
|
||||
// cout << "read_resources NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
XMLSerializerFactory::Parameters* par=read_properties(prop);
|
||||
|
@ -288,34 +307,118 @@ void XMLSerializer::read_resources(xmlNodePtr resources_node, XMLSerializerFacto
|
|||
}
|
||||
void XMLSerializer::read_schedulables(xmlNodePtr schedulables_node, XMLSerializerFactory& fact)
|
||||
{
|
||||
if(schedulables_node==NULL)
|
||||
return;
|
||||
|
||||
xmlNodePtr cur;
|
||||
cur = schedulables_node->children;
|
||||
while(cur!=NULL)
|
||||
{
|
||||
cout << "NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
while (prop != NULL) {
|
||||
cout << "PROP: " << prop->name;
|
||||
|
||||
if(prop->children && xmlNodeIsText(prop->children)){
|
||||
xmlChar *key = xmlNodeGetContent (prop->children);
|
||||
// xmlChar *key = xmlNodeListGetString(doc, prop->children, 1);
|
||||
if(key!=NULL)
|
||||
{
|
||||
cout << " VALUE: " << key;
|
||||
xmlFree(key);
|
||||
}
|
||||
else
|
||||
cout << " !VALUE IS NULL! ";
|
||||
Glib::ustring node_name((const char *)cur->name);
|
||||
if(node_name=="process")
|
||||
{
|
||||
// cout << "read_schedulables NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
XMLSerializerFactory::Parameters* par=read_properties(prop);
|
||||
if(par!=NULL)
|
||||
{
|
||||
fact.factory_method(Glib::ustring("Process"), *par);
|
||||
}
|
||||
cout << endl;
|
||||
prop = prop->next;
|
||||
// pass the "threads node"
|
||||
read_threads(cur->children, fact);
|
||||
}
|
||||
|
||||
cur = cur->next;
|
||||
}
|
||||
}
|
||||
|
||||
void XMLSerializer::read_threads(xmlNodePtr threads_node, XMLSerializerFactory& fact)
|
||||
{
|
||||
if(threads_node==NULL)
|
||||
return;
|
||||
|
||||
xmlNodePtr cur;
|
||||
cur = threads_node->children;
|
||||
while(cur!=NULL)
|
||||
{
|
||||
Glib::ustring node_name((const char *)cur->name);
|
||||
if(node_name=="thread")
|
||||
{
|
||||
// cout << "read_threads NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
XMLSerializerFactory::Parameters* par=read_properties(prop);
|
||||
if(par!=NULL)
|
||||
{
|
||||
fact.factory_method(Glib::ustring("Thread"), *par);
|
||||
}
|
||||
// pass the "requests node"
|
||||
read_requests(cur->children, fact);
|
||||
}
|
||||
|
||||
cur = cur->next;
|
||||
}
|
||||
}
|
||||
|
||||
void XMLSerializer::read_requests(xmlNodePtr requests_node, XMLSerializerFactory& fact)
|
||||
{
|
||||
if(requests_node==NULL)
|
||||
{
|
||||
// cout << "read_requests NULL" << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
xmlNodePtr cur;
|
||||
cur = requests_node->children;
|
||||
while(cur!=NULL)
|
||||
{
|
||||
Glib::ustring node_name((const char *)cur->name);
|
||||
if(node_name=="request")
|
||||
{
|
||||
// cout << "read_requests NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
XMLSerializerFactory::Parameters* par=read_properties(prop);
|
||||
if(par!=NULL)
|
||||
{
|
||||
fact.factory_method(Glib::ustring("Request"), *par);
|
||||
}
|
||||
// pass the "subrequest nodes"
|
||||
read_subrequests(cur->children, fact);
|
||||
}
|
||||
|
||||
cur = cur->next;
|
||||
}
|
||||
}
|
||||
|
||||
void XMLSerializer::read_subrequests(xmlNodePtr subrequest_node, XMLSerializerFactory& fact)
|
||||
{
|
||||
if(subrequest_node==NULL)
|
||||
{
|
||||
// cout << "read_subrequest NULL" << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
xmlNodePtr cur;
|
||||
cur = subrequest_node;
|
||||
while(cur!=NULL)
|
||||
{
|
||||
Glib::ustring node_name((const char *)cur->name);
|
||||
if(node_name=="subrequest")
|
||||
{
|
||||
// cout << "read_subrequest NODE: " << cur->name << endl;
|
||||
|
||||
xmlAttrPtr prop = cur->properties;
|
||||
XMLSerializerFactory::Parameters* par=read_properties(prop);
|
||||
if(par!=NULL)
|
||||
{
|
||||
fact.factory_method(Glib::ustring("SubRequest"), *par);
|
||||
}
|
||||
}
|
||||
|
||||
cur = cur->next;
|
||||
}
|
||||
}
|
||||
|
||||
/* comment */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue