X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/0768f357f8e01a0baedfbb0ae1adf0e6fd4d4261..fecff0df7697f3fa9351eee19c4cd30711c2b68e:/src/jacu.c?ds=sidebyside

diff --git a/src/jacu.c b/src/jacu.c
index d31c648..f0c3444 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -18,12 +18,16 @@ int main(int argc, char* argv[])
 	int zflag = 0;
 	int tflag = 0;
 	int qflag = 0;
+	int sflag = 0;
+	int mflag = 0;
 	long int volumesize = 0;
 	size_t pagesize = 32768; /* 32KB */
 	int ch;
 	t_BlockSort *bs;
+	HUFF_STATE *shuff;
+	char *staticmodel = NULL;
 			
-	while ((ch = getopt(argc, argv, "cdzt:q:")) != -1) { 
+	while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) { 
 		 
 		switch (ch) { 
 			case 'c': cflag = 1; 
@@ -34,6 +38,13 @@ int main(int argc, char* argv[])
 
 			case 'z': zflag = 1; 
 					  break; 
+			
+			case 'm': mflag = 1;
+					  staticmodel = optarg;
+					  break; 
+			
+			case 's': sflag = 1; 					  
+					  break;
 
 			case 't': tflag = 1; 
 				volumesize = atol(optarg);
@@ -66,13 +77,13 @@ int main(int argc, char* argv[])
 				}
 				break; 
 
-			default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]); 
+			default: fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
 					 return(2);
 		}
 	}
 		
-	if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) ) {
-		fprintf(stderr, "Usage: %s [-cdt] sourcefile targetfile\n", argv[0]); 
+	if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) || (mflag & sflag)) {
+		fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); 
 		return (3);
 	}
 	if ((tflag) && (volumesize <= 0l)) {
@@ -85,50 +96,62 @@ int main(int argc, char* argv[])
 	}
 		
 	if (cflag == 1) {
-		/* Comprimo */
-		/* No me gusta el tmpfile ... es para probar como anda todo junto */
-		FILE *fp, *fp_out;
+		/* Comprimo */		
+		FILE *fp;
 		Uint32 i, j, total, k;
 		char *mtf;
-		char *salida, *data, c;
+		char *salida, *data;
 		char *z;
 		int z_len;
-
+		
+		/* Preparo el compresor huffman */
+		if ((shuff = shuff_init_encoder_bychunk(argv[optind+1],volumesize*1024)) == NULL) return 0;
+		if (mflag == 1) shuff_loadmodel(shuff,staticmodel);
+		
+		/* Preparo el BS alocando mem para el K, el Block y su Size */
 		data = malloc(sizeof(char)*pagesize);
-		/* Reservo lugar tambien para guardar el k y el tamaño  */
-		salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);
+		salida = malloc(sizeof(char)*pagesize+sizeof(Uint32)*2);
 		bs = bs_create(pagesize);
 
-		fp = fopen(argv[optind], "rb");
-		fp_out = fopen("tmp.comp", "wb");
+		/* Abrimos el archivo a comprimir y encodeamos bloques */
+		fp = fopen(argv[optind], "rb");						
 
-		c = fgetc(fp);
 		total = 0;
 		while (!feof(fp)) {
 			i = 0;
 			while ((!feof(fp)) && (i < pagesize)) {
-				data[i++] = c;
-				c = fgetc(fp);
+				data[i++] = fgetc(fp);
 				total++;
 			}
 
-			/* Hago el BS */
+			/* Saco un EOF que lee de mas */
+			if (i<pagesize) i--;
+
+			/* Aplico el BlockSorting */
 			bs_solve(data, salida, bs, &k, i);
 
-			printf("BS k=%ld\n", k);
-			printf("PageSize = %ld\n", i);
+			/*printf("BS k=%ld\n", *(Uint32 *)(salida+sizeof(Uint32)));
+			printf("PageSize = %ld\n", *(Uint32 *)salida);
 
+			printf("Antes de MTF = %ld [", i);
+			{
+				int ii;
+				for(ii=0; ii<(i+sizeof(Uint32)); ii++)
+					printf("(%c)", salida[ii+sizeof(Uint32)]);
+				printf("]\n");
+			}*/
+			
 			/* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
 			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
-
+/*
 			printf("MTF Z (len=%d) = [", z_len);
 			{
 				int ii;
 				for(ii=0; ii<z_len; ii++)
-					printf("%c", z[ii]);
+					printf("(%c)", z[ii]);
 				printf("]\n");
 
-			}
+			}*/
 			/* Si me lo piden, aplico ZG. */
 			if (zflag) {
 				size_t len;
@@ -137,39 +160,36 @@ int main(int argc, char* argv[])
 				zg_init(&zg);
 				/* TODO HACER LO MISMO QUE EN EL ELSE XXX */
 				for (j = 0; j < i; ++j)
-					if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
+					if ((len = zg_group(&zg, buff, mtf[j]))) shuff_scanfreq_chunk(shuff,buff,len);
 			} else {
 				/* Guardo el PageSize */
-				//for(j=0; j<sizeof(Uint32); j++)
-				//	fputc(mtf[j], fp_out);
-				fwrite(&i, sizeof(Uint32), 1, fp_out);
-
+				shuff_scanfreq_chunk(shuff,salida,sizeof(Uint32));
+				
 				/* Guardo el Z len y el Z */
-				fwrite(&z_len, sizeof(int), 1, fp_out);
-				fwrite(z, z_len, sizeof(char), fp_out);
+				shuff_scanfreq_chunk(shuff,(char*)&z_len,sizeof(int));
+				shuff_scanfreq_chunk(shuff,z,z_len);								
 
-				/* Guardo la salida del MTF */
-				for(j=sizeof(Uint32); j<i; j++)
-					fputc(mtf[j], fp_out);
+				/* Guardo la salida del MTF */				
+				shuff_scanfreq_chunk(shuff,mtf,i+sizeof(Uint32));				
 			}
 			free(mtf);
 			free(z);
 		}
 
 		/* Limpiando */
-		fclose(fp);
-		fclose(fp_out);
+		fclose(fp);		
 		bs_destroy(bs);
 
-		/* Comprimo con huffman */
-		i = shuff_encode_file("tmp.comp", argv[optind+1], volumesize);
-
-		/* borro el temporal */
-		remove("tmp.comp");
+		/* Comprimo con Huffman */		
+		shuff_encode_file(shuff);
+		if (sflag == 1) shuff_savemodel(shuff);
+		/* Shutdown Huffman */
+		shuff_deinit_encoder(shuff);
+		free(shuff);
 
 		/* Muestro bpb */
 		printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));
-		return i;
+		return 0;
 	}
 	
 	if (dflag == 1) { 
@@ -181,45 +201,64 @@ int main(int argc, char* argv[])
 		char *z;
 		int z_len;
 
-		shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
+		if ((shuff = shuff_init_decoder(argv[optind],"tmp.comp")) == NULL) return 1;
+		shuff_decode_file(shuff);
+		shuff_deinit_decoder(shuff);
+		free(shuff);
+		
 		fp_in = fopen("tmp.comp", "rb");
 		fp_out = fopen(argv[optind+1], "wb");
 
 		while (!feof(fp_in)) {
 			block_size = 0;
-			PERR("Leo bloque");
 			fread(&block_size, sizeof(Uint32), 1, fp_in);
-			printf("PageSize = %ld\n", block_size);
-			fread(&z_len, sizeof(int), 1, fp_in);
-			z = malloc(sizeof(char)*z_len);
-			fread(z, z_len, sizeof(char), fp_in);
-
-			printf("MTF Z (len=%d) = [", z_len);
-			{
-				int ii;
-				for(ii=0; ii<z_len; ii++)
-					printf("%c", z[ii]);
-				printf("]\n");
-
-			}
 			if (block_size > 0) {
+				fread(&z_len, sizeof(int), 1, fp_in);
+				z = malloc(sizeof(char)*z_len);
+				fread(z, z_len, sizeof(char), fp_in);
+
+				/*printf("MTF Z (len=%d) = [", z_len);
+				{
+					int ii;
+					for(ii=0; ii<z_len; ii++)
+						printf("(%c)", z[ii]);
+					printf("]\n");
+	
+				}*/
+				
 				block = malloc(block_size*sizeof(char)+sizeof(Uint32));
 				orig = malloc(block_size*sizeof(char));
-				fread(block, block_size, sizeof(char), fp_in);
+				fread(block, block_size+sizeof(Uint32), sizeof(char), fp_in);
 
+				/*printf("Antes MTF_inv = [");
+				{
+					int ii;
+					for(ii=0; ii<block_size+sizeof(Uint32); ii++)
+						printf("(%c)", block[ii]);
+					printf("]\n");
+				}*/
 				/* Hago el MTF inverso */
-				mtf = jacu_mtf_inv(z, block, block_size);
+				mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
+
+				/*printf("Luego de MTF Inv= [");
+				{
+					int ii;
+					for(ii=0; ii<block_size+sizeof(Uint32); ii++)
+						printf("(%c)", mtf[ii]);
+					printf("]\n");
+				}*/
 
 				/* Luego de hacer el MTF inverso ya puedo recuperar el k */
-				memcpy(&k, block, sizeof(Uint32));
+				memcpy(&k, mtf, sizeof(Uint32));
 
-				printf("Restored : k=%ld\n", k);
-				bs_restore(orig, block+sizeof(Uint32), k, block_size);
+				/*printf("Restored : k=%ld\n", k);*/
+				bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 
 				fwrite(orig, block_size, sizeof(char), fp_out);
 				free(block);
 				free(orig);
 				free(mtf);
+				free(z);
 			}
 		}
 		fclose(fp_in);
@@ -239,4 +278,3 @@ long get_file_size(const char* filename)
 	fclose(file);
 	return file_size;
 }
-