From aecb11873dde5425c1acdf8791736461f3628b14 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 17 Oct 2019 16:03:33 +0000
Subject: [PATCH] Non debugged compression of integer fields
---
src/snapshot.c | 108 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 39 deletions(-)
diff --git a/src/snapshot.c b/src/snapshot.c
index 177557d..6d4c993 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -1,3 +1,5 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<general.h>
#include<snapshot.h>
@@ -7,6 +9,7 @@
#include<inttypes.h>
#include<config.h>
#include <time.h>
+#include <string.h>
#include "io.h"
/* a helper function that utilizes ts_string data structure and performs same as sprintf */
ts_uint ts_sprintf(ts_string *str, char *fmt, ...){
@@ -22,7 +25,7 @@
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->string=(char *)malloc(5120000*sizeof(char)); /*TODO: warning, can break if the string is to long */
data->beg=0;
xml_trisurf_header(fh, vesicle);
@@ -30,14 +33,16 @@
xml_trisurf_tria_neigh(data,vesicle->tlist);
xml_trisurf_vtx_neigh(data,vesicle->vlist);
xml_trisurf_vtx_tristar(data,vesicle->vlist);
-#ifdef COMPRESSION
+ xml_trisurf_nucleus(data,vesicle);
+ xml_trisurf_constvolarea(data,V0,A0);
+//#ifdef COMPRESSION
char *compressed;
ts_uint nbytes=ts_compress_string64(data->string, data->beg-1, &compressed); //suppress null character at the end with by substracting 1
fwrite(compressed, sizeof(unsigned char), nbytes, fh);
free (compressed);
-#else
- fprintf(fh,"%s", data->string);
-#endif
+//#else
+// fprintf(fh,"%s", data->string);
+//#endif
free(data->string); /* TODO: valgrind is not ok with this! */
free(data);
xml_trisurf_footer(fh);
@@ -55,7 +60,7 @@
fprintf(fh, "<trisurfversion>Trisurf (commit %s), compiled on %s %s</trisurfversion>\n",TS_VERSION, __DATE__, __TIME__);
fprintf(fh, "<dumpdate>%s</dumpdate>\n", c_time_string);
- fprintf(fh, "<tape>\n");
+ fprintf(fh, "<tape>");
fprintf(fh,"%s",tapetxt);
fprintf(fh, "</tape>\n");
if(vesicle->poly_list!=NULL){
@@ -69,7 +74,7 @@
npoly=0;
nfono=0;
}
- fprintf(fh, "<trisurf nvtx=\"%u\" npoly=\"%u\" nfono=\"%u\" compressed=\"false\">\n", vesicle->vlist->n, npoly, nfono);
+ fprintf(fh, "<trisurf nvtx=\"%u\" npoly=\"%u\" nmono=\"%u\" compressed=\"false\">\n", vesicle->vlist->n, npoly, nfono);
return TS_SUCCESS;
}
@@ -122,7 +127,18 @@
return TS_SUCCESS;
}
+ts_bool xml_trisurf_nucleus(ts_string *data, ts_vesicle* vesicle){
+ if(vesicle->R_nucleus>0.0 || (vesicle->R_nucleusX>0.0 && vesicle->R_nucleusY>0.0 && vesicle->R_nucleusZ>0.0)){
+ ts_sprintf(data,"<nucleus>%.17e %.17e %.17e</nucleus>",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
+ }
+ return TS_SUCCESS;
+}
+ts_bool xml_trisurf_constvolarea(ts_string *data, ts_double volume, ts_double area){
+ ts_sprintf(data,"<constant_volume>%.17e</constant_volume>",volume);
+ ts_sprintf(data,"<constant_area>%.17e</constant_area>",area);
+ return TS_SUCCESS;
+}
/* UTILITIES */
@@ -130,7 +146,7 @@
/* zlib compression base64 encoded */
/* compressed must not be pre-malloced */
/* taken from https://gist.github.com/arq5x/5315739 */
-ts_uint ts_compress_string64(char *data, ts_uint data_len, char **compressed){
+ts_uint ts_compress_data(char *data, ts_uint data_len, char **compressed){
z_stream defstream;
defstream.zalloc = Z_NULL;
defstream.zfree = Z_NULL;
@@ -143,12 +159,34 @@
deflateInit(&defstream, Z_BEST_COMPRESSION);
deflate(&defstream, Z_FINISH);
deflateEnd(&defstream);
- /*base64 encode*/
- size_t nbase;
- *compressed=base64_encode((unsigned char *)compr,(size_t)defstream.total_out,&nbase);
+ *compressed=compr;
+// *compressed=base64_encode((unsigned char *)compr,(size_t)defstream.total_out,&nbase);
//fwrite(base64, sizeof(unsigned char), nbase, fh);
+// free(compr);
+ return defstream.total_out;
+}
+
+ts_uint ts_compress_string64(char *data, ts_uint data_len, char **encoded_compressed){
+ size_t nbase;
+ char *compr;
+ size_t number_of_compressed_bytes=ts_compress_data(data, data_len, &compr);
+ *encoded_compressed=base64_encode((unsigned char *)compr,number_of_compressed_bytes,&nbase);
free(compr);
return nbase;
+}
+
+char *ts_compress_intlist(int *data, ts_uint data_len){
+ size_t nbase;
+ char *compr;
+ size_t number_of_compressed_bytes=ts_compress_data((char *)data, data_len*sizeof(int), &compr);
+ char *encoded_compressed=base64_encode((unsigned char *)compr,number_of_compressed_bytes,&nbase);
+ free(compr);
+ ts_uint header[4]={1, data_len, data_len, nbase};
+ char *encoded_header=(char *)base64_encode((unsigned char *)header, 4*sizeof(ts_uint), &nbase);
+ encoded_header=realloc(encoded_header, 4*sizeof(ts_uint)+strlen(encoded_compressed));
+ encoded_header=strcat(encoded_header,encoded_compressed);
+ free(encoded_compressed);
+ return encoded_header;
}
ts_uint ts_decompress_string64(char *b64, ts_uint data_len, char **decompressed){
@@ -169,10 +207,7 @@
static int mod_table[] = {0, 2, 1};
-char *base64_encode(const unsigned char *data,
- size_t input_length,
- size_t *output_length) {
-
+char *base64_encode(const unsigned char *data, size_t input_length, size_t *output_length) {
*output_length = 4 * ((input_length + 2) / 3);
int i,j;
char *encoded_data = malloc(*output_length);
@@ -180,29 +215,25 @@
for (i = 0, j = 0; i < input_length;) {
- uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0;
- uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0;
- uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0;
+ uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0;
+ uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0;
+ uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0;
+ uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
- uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
- encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F];
- encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F];
- encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F];
- encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F];
}
for (i = 0; i < mod_table[input_length % 3]; i++)
- encoded_data[*output_length - 1 - i] = '=';
+ encoded_data[*output_length - 1 - i] = '=';
return encoded_data;
}
-unsigned char *base64_decode(const char *data,
- size_t input_length,
- size_t *output_length) {
-
+unsigned char *base64_decode(const char *data, size_t input_length, size_t *output_length) {
int i,j;
if (decoding_table == NULL) build_decoding_table();
@@ -216,20 +247,19 @@
if (decoded_data == NULL) return NULL;
for (i = 0, j = 0; i < input_length;) {
+ uint32_t sextet_a = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
+ uint32_t sextet_b = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
+ uint32_t sextet_c = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
+ uint32_t sextet_d = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
- uint32_t sextet_a = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
- uint32_t sextet_b = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
- uint32_t sextet_c = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
- uint32_t sextet_d = data[i] == '=' ? 0 & i++ : decoding_table[(int)data[i++]];
-
- uint32_t triple = (sextet_a << 3 * 6)
+ uint32_t triple = (sextet_a << 3 * 6)
+ (sextet_b << 2 * 6)
+ (sextet_c << 1 * 6)
+ (sextet_d << 0 * 6);
- if (j < *output_length) decoded_data[j++] = (triple >> 2 * 8) & 0xFF;
- if (j < *output_length) decoded_data[j++] = (triple >> 1 * 8) & 0xFF;
- if (j < *output_length) decoded_data[j++] = (triple >> 0 * 8) & 0xFF;
+ if (j < *output_length) decoded_data[j++] = (triple >> 2 * 8) & 0xFF;
+ if (j < *output_length) decoded_data[j++] = (triple >> 1 * 8) & 0xFF;
+ if (j < *output_length) decoded_data[j++] = (triple >> 0 * 8) & 0xFF;
}
if(decoding_table !=NULL) free(decoding_table);
return decoded_data;
@@ -241,7 +271,7 @@
decoding_table = malloc(256);
int i;
for (i = 0; i < 64; i++)
- decoding_table[(unsigned char) encoding_table[i]] = i;
+ decoding_table[(unsigned char) encoding_table[i]] = i;
}
--
Gitblit v1.9.3