X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/4a5eff6d8da2d75b358aed1a3040930b7e25fa3b..eb5347f4df35aaa5266fcbd04112ae4cc1cf41b1:/src/jacu.c?ds=sidebyside diff --git a/src/jacu.c b/src/jacu.c index 895ac4d..baf28da 100644 --- a/src/jacu.c +++ b/src/jacu.c @@ -1,9 +1,11 @@ +/* Jacu Team - GPL */ #include "blocksorting/bs.h" #include "mtf/mtf.h" #include "zerogrouping/zerogrouping.h" #include "statichuff/statichuff.h" #include "vfile/vfile.h" +#include "vfile/common.h" #include #include #include @@ -16,13 +18,17 @@ int main(int argc, char* argv[]) int dflag = 0; int zflag = 0; int tflag = 0; - int pflag = 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:p:")) != -1) { + while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) { switch (ch) { case 'c': cflag = 1; @@ -33,67 +39,101 @@ int main(int argc, char* argv[]) case 'z': zflag = 1; break; - - case 't': tflag = 1; - volumesize = atol(optarg); - break; - - case 'p': pflag = 1; - pagesize = atoi(optarg); + + case 'm': mflag = 1; + staticmodel = optarg; break; + + case 's': sflag = 1; + break; - default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]); + case 't': tflag = 1; + volumesize = atol(optarg); + break; + + case 'q': qflag = 1; + switch (atoi(optarg)) + { + case 0: pagesize = 1024; /* 1K */ + break; + case 1: pagesize = 2048; /* 2K */ + break; + case 2: pagesize = 4096; /* 4K */ + break; + case 3: pagesize = 8192; /* 8K */ + break; + case 4: pagesize = 16384; /* 16K */ + break; + case 5: pagesize = 32768; /* 32K */ + break; + case 6: pagesize = 65536; /* 64K */ + break; + case 7: pagesize = 131072; /* 128K */ + break; + case 8: pagesize = 262144; /* 256K */ + break; + case 9: pagesize = 524288; /* 512K */ + break; + default: pagesize = 0; /* error */ + } + break; + + 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)) { fprintf(stderr,"Error: The volume size must be a non-zero value\n"); return (4); } - if ((pflag) && (pagesize <= 1u)) { - fprintf(stderr,"Error: El tamaño de página debe ser mayor a 1 byte.\n"); + if ((qflag) && (pagesize <= 1u)) { + fprintf(stderr,"Error: El nivel de compresión debe ser entre 0 (menor) y 9 (mayor).\n"); return (5); } 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 *z; + unsigned char *mtf; + unsigned char *salida, *data; + unsigned char *z; int z_len; - - data = malloc(sizeof(char)*pagesize); - /* Reservo lugar tambien para guardar el k y el tamaño */ - salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2); + + /* 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(unsigned char)*pagesize); + salida = malloc(sizeof(unsigned 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 0) { - block = malloc((block_size+sizeof(Uint32))*sizeof(char)); - orig = malloc(block_size*sizeof(char)); - vfread(block, block_size, sizeof(char), fp_in); + moredata = shuff_decode_chunk(shuff,(char*)&z_len,sizeof(int),&decoded); + z = malloc(sizeof(unsigned char)*z_len); + moredata = shuff_decode_chunk(shuff,z,z_len,&decoded); - mtf = jacu_mtf_inv(z, block, block_size); + block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32)); + orig = malloc(block_size*sizeof(unsigned char)); + moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded); - memcpy(&k, block, sizeof(Uint32)); + mtf = jacu_mtf_inv(z, block, block_size*sizeof(unsigned char)+sizeof(Uint32)); - bs_restore(orig, block+sizeof(Uint32), k, block_size); + /* Luego de hacer el MTF inverso ya puedo recuperar el k */ + memcpy(&k, mtf, sizeof(Uint32)); - fwrite(orig, block_size, sizeof(char), fp_out); + /*printf("Restored : k=%ld\n", k);*/ + bs_restore(orig, mtf+sizeof(Uint32), k, block_size); + + fwrite(orig, block_size, sizeof(unsigned char), fp_out); free(block); free(orig); free(mtf); + free(z); } - } - vfclose(fp_in); + } while (moredata); + + /* Close up files */ fclose(fp_out); + + /* Shutdown Huffman */ + shuff_deinit_decoder(shuff); + free(shuff); } return 0; @@ -185,4 +239,3 @@ long get_file_size(const char* filename) fclose(file); return file_size; } -