From bb40336eb8a2acc9f2e3d2e9059b7d90afe5c0c4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 29 Feb 2016 09:14:58 +0000
Subject: [PATCH] Some leaks still present in xml parsing library.
---
src/restore.c | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 0ca42ec..aae6cb0 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -12,6 +12,7 @@
#include "triangle.h"
#include "bond.h"
#include "energy.h"
+#include "poly.h"
#include "initial_distribution.h"
ts_bool parseDump(char *dumpfname) {
@@ -50,12 +51,12 @@
if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Points"))){
fprintf(stderr,"Found point data\n");
if(vesicle!=NULL)
- parseXMLVertexPosition(vesicle, doc, cur);
+ parseXMLVertexPosition(vesicle, doc, cur2);
}
if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
fprintf(stderr,"Found cell(Bonds) data\n");
if(vesicle!=NULL)
- parseXMLBonds(vesicle, doc, cur);
+ parseXMLBonds(vesicle, doc, cur2);
}
cur2=cur2->next;
}
@@ -68,14 +69,18 @@
}
xmlFreeDoc(doc);
+
+ vesicle->poly_list=init_poly_list(0, 0, vesicle->vlist, vesicle);
+
init_normal_vectors(vesicle->tlist);
mean_curvature_and_energy(vesicle);
/* TODO: cells, polymeres, filaments, core, tape */
fprintf(stderr,"Restoration completed\n");
- exit(0);
+// write_vertex_xml_file(vesicle,999);
vesicle_free(vesicle);
+ exit(0);
return TS_SUCCESS;
}
@@ -190,14 +195,18 @@
char *tria;
char *vtx[3];
- ts_uint i;
+ ts_uint i,j;
triangles = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
tria=(char *)triangles;
- for(i=0;i<3;i++) vtx[i]=strtok(tria," ");
+ vtx[0]=strtok(tria," ");
+ for(i=1;i<3;i++) vtx[i]=strtok(NULL," ");
+ j=0;
while(vtx[2]!=NULL){
triangle_add(vesicle->tlist, vesicle->vlist->vtx[atoi(vtx[0])],vesicle->vlist->vtx[atoi(vtx[1])],vesicle->vlist->vtx[atoi(vtx[2])]);
for(i=0;i<3;i++) vtx[i]=strtok(NULL," ");
+ j++;
}
+ fprintf(stderr,"Parsing triangles %s j=%d\n",triangles,j);
xmlFree(triangles);
return TS_SUCCESS;
@@ -211,7 +220,8 @@
ts_uint i,j;
triangles = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
tria=(char *)triangles;
- for(i=0;i<3;i++) ntria[i]=strtok(tria," ");
+ ntria[0]=strtok(tria," ");
+ for(i=1;i<3;i++) ntria[i]=strtok(NULL," ");
j=0;
while(ntria[2]!=NULL){
triangle_add_neighbour(vesicle->tlist->tria[j],vesicle->tlist->tria[atoi(ntria[0])]);
@@ -266,42 +276,52 @@
if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
points = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
pts=(char *)points;
- for(i=0;i<3;i++) token[i]=strtok(pts," ");
+ token[0]=strtok(pts," ");
+ token[1]=strtok(NULL," ");
+ token[2]=strtok(NULL,"\n");
idx=0;
while(token[0]!=NULL){
vesicle->vlist->vtx[idx]->x=atof(token[0]);
vesicle->vlist->vtx[idx]->y=atof(token[1]);
vesicle->vlist->vtx[idx]->z=atof(token[2]);
- for(i=0;i<3;i++) token[i]=strtok(NULL," ");
+ for(i=0;i<2;i++) token[i]=strtok(NULL," ");
+ token[2]=strtok(NULL,"\n");
idx++;
}
xmlFree(points);
}
child=child->next;
}
+ fprintf(stderr,"Vertices position j=%d\n",idx);
+
return TS_SUCCESS;
}
ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur){
xmlNodePtr child = cur->xmlChildrenNode;
- xmlChar *bonds;
+ xmlChar *bonds, *conname;
char *b;
- int i, idx;
+ int idx;
char *token[2];
while (child != NULL) {
- if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
+ conname=xmlGetProp(child, (xmlChar *)"Name");
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(conname, (const xmlChar *)"connectivity") ){
bonds = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
b=(char *)bonds;
- for(i=0;i<2;i++) token[i]=strtok(b," ");
+ token[0]=strtok(b," ");
+ token[1]=strtok(NULL,"\n");
idx=0;
while(token[0]!=NULL){
bond_add(vesicle->blist, vesicle->vlist->vtx[atoi(token[0])], vesicle->vlist->vtx[atoi(token[1])]);
- for(i=0;i<2;i++) token[i]=strtok(NULL," ");
+ token[0]=strtok(NULL," ");
+ token[1]=strtok(NULL,"\n");
idx++;
}
xmlFree(bonds);
}
+ xmlFree(conname);
child=child->next;
}
+ fprintf(stderr,"Bond data j=%d\n",idx);
return TS_SUCCESS;
}
--
Gitblit v1.9.3