From 22721d3dc98cae61db96021c01ee8dc1cbdf462d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 15 Feb 2016 18:51:48 +0000
Subject: [PATCH] Added zlib and compression as an option to snapshots

---
 src/snapshot.c |   80 ++++++++++++++++++++++++++++++----------
 1 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/snapshot.c b/src/snapshot.c
index c845e06..ee735f8 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -1,12 +1,52 @@
 #include<stdio.h>
 #include<general.h>
 #include<snapshot.h>
+#include<stdlib.h>
+#include<stdarg.h>
+#include <zlib.h>
+ts_uint ts_sprintf(ts_string *str, char *fmt, ...){
+	va_list ap;
+	va_start(ap,fmt);
+	ts_uint n=vsprintf(&(str->string[str->beg]),fmt,ap);
+	va_end(ap);
+	str->beg+=n;
+	return n;
+}
+
+
 ts_bool xml_trisurf_data(FILE *fh, ts_vesicle *vesicle){
+
+	ts_string *data=(ts_string *)malloc(sizeof(ts_sprintf));
+	data->string=(char *)malloc(512000*sizeof(char)); /*TODO: warning, can break if the string is to long */
+	data->beg=0;
+	
 	xml_trisurf_header(fh, vesicle);
-	xml_trisurf_tria(fh,vesicle->tlist);
-	xml_trisurf_tria_neigh(fh,vesicle->tlist);
-	xml_trisurf_vtx_neigh(fh,vesicle->vlist);
-	xml_trisurf_vtx_tristar(fh,vesicle->vlist);
+	xml_trisurf_tria(data,vesicle->tlist);
+	xml_trisurf_tria_neigh(data,vesicle->tlist);
+	xml_trisurf_vtx_neigh(data,vesicle->vlist);	
+	xml_trisurf_vtx_tristar(data,vesicle->vlist);
+#ifdef COMPRESSION
+	z_stream defstream;
+	defstream.zalloc = Z_NULL;
+	defstream.zfree = Z_NULL;
+	defstream.opaque = Z_NULL;
+	defstream.avail_in = data->beg+1;
+	defstream.next_in = (unsigned char *)data->string;	
+	char *compr=(char *)malloc((data->beg+1)*sizeof(char *));
+	defstream.avail_out = data->beg+1;
+	defstream.next_out = (unsigned char *)compr;
+	deflateInit(&defstream, Z_BEST_COMPRESSION);
+    	deflate(&defstream, Z_FINISH);
+    	deflateEnd(&defstream);
+	fwrite(compr, sizeof(unsigned char), defstream.total_out, fh);
+//	fprintf(fh,"%s",compr);
+//printf("Uncompressed size is: %lu\n", defstream.total_out);
+	free(compr);
+#else
+	fprintf(fh,"%s", data->string);
+#endif
+	free(data->string);
+	free(data);
 	xml_trisurf_footer(fh);
 	return TS_SUCCESS;
 }
@@ -21,46 +61,46 @@
 	return TS_SUCCESS;
 }
 
-ts_bool xml_trisurf_tria(FILE *fh, ts_triangle_list *tlist){
+ts_bool xml_trisurf_tria(ts_string *data, ts_triangle_list *tlist){
 	ts_uint i;
-	fprintf(fh,"<tria>\n");
+	ts_sprintf(data,"<tria>\n");
 	for(i=0; i<tlist->n;i++){
-		fprintf(fh,"%u %u %u\n",tlist->tria[i]->vertex[0]->idx, tlist->tria[i]->vertex[1]->idx, tlist->tria[i]->vertex[2]->idx);
+		ts_sprintf(data,"%u %u %u\n",tlist->tria[i]->vertex[0]->idx, tlist->tria[i]->vertex[1]->idx, tlist->tria[i]->vertex[2]->idx);
 	}
-	fprintf(fh,"</tria>\n");
+	ts_sprintf(data,"</tria>\n");
 	return TS_SUCCESS;
 }
 
-ts_bool xml_trisurf_tria_neigh(FILE *fh, ts_triangle_list *tlist){
+ts_bool xml_trisurf_tria_neigh(ts_string *data, ts_triangle_list *tlist){
 	ts_uint i;
-	fprintf(fh,"<trianeigh>\n");
+	ts_sprintf(data,"<trianeigh>\n");
 	for(i=0; i<tlist->n;i++){
-		fprintf(fh,"%u %u %u\n",tlist->tria[i]->neigh[0]->idx, tlist->tria[i]->neigh[1]->idx, tlist->tria[i]->neigh[2]->idx);
+		ts_sprintf(data,"%u %u %u\n",tlist->tria[i]->neigh[0]->idx, tlist->tria[i]->neigh[1]->idx, tlist->tria[i]->neigh[2]->idx);
 	}
-	fprintf(fh,"</trianeigh>\n");
+	ts_sprintf(data,"</trianeigh>\n");
 	return TS_SUCCESS;
 }
 
-ts_bool xml_trisurf_vtx_neigh(FILE *fh, ts_vertex_list *vlist){
+ts_bool xml_trisurf_vtx_neigh(ts_string *data, ts_vertex_list *vlist){
 	ts_uint i,j;
 	for(i=0;i<vlist->n;i++){
-		fprintf(fh,"<vtxn idx=\"%u\">",vlist->vtx[i]->idx);
+		ts_sprintf(data,"<vtxn idx=\"%u\">",vlist->vtx[i]->idx);
 		for(j=0;j<vlist->vtx[i]->neigh_no;j++){
-			fprintf(fh,"%u ",vlist->vtx[i]->neigh[j]->idx);
+			ts_sprintf(data,"%u ",vlist->vtx[i]->neigh[j]->idx);
 		}
-		fprintf(fh, "</vtxn>\n");
+		ts_sprintf(data, "</vtxn>\n");
 	}
 	return TS_SUCCESS;
 }
 
-ts_bool xml_trisurf_vtx_tristar(FILE *fh, ts_vertex_list *vlist){
+ts_bool xml_trisurf_vtx_tristar(ts_string *data, ts_vertex_list *vlist){
 	ts_uint i,j;
 	for(i=0;i<vlist->n;i++){
-		fprintf(fh,"<tristar idx=\"%u\">",vlist->vtx[i]->idx);
+		ts_sprintf(data,"<tristar idx=\"%u\">",vlist->vtx[i]->idx);
 		for(j=0;j<vlist->vtx[i]->tristar_no;j++){
-			fprintf(fh,"%u ",vlist->vtx[i]->tristar[j]->idx);
+			ts_sprintf(data,"%u ",vlist->vtx[i]->tristar[j]->idx);
 		}
-		fprintf(fh, "</tristar>\n");
+		ts_sprintf(data, "</tristar>\n");
 	}
 	return TS_SUCCESS;
 }

--
Gitblit v1.9.3