//#define ZSTD
-#if 0
-static size_t compress_file(FILE *in, FILE *out, size_t *size_in,
- size_t *size_out) {
- char *src, *buf = NULL;
- size_t r = 1;
- size_t size, n, k, count_in = 0, count_out = 0, offset, frame_size = 0;
-
- src = malloc(BUF_SIZE);
- if (!src) {
- printf("Not enough memory\n");
- goto cleanup;
- }
-
- size = BUF_SIZE + LDM_HEADER_SIZE;
- buf = malloc(size);
- if (!buf) {
- printf("Not enough memory\n");
- goto cleanup;
- }
-
-
- for (;;) {
- k = fread(src, 1, BUF_SIZE, in);
- if (k == 0)
- break;
- count_in += k;
-
- n = LDM_compress(src, buf, k, BUF_SIZE);
-
- // n = k;
- // offset += n;
- offset = k;
- count_out += k;
-
-// k = fwrite(src, 1, offset, out);
-
- k = fwrite(buf, 1, offset, out);
- if (k < offset) {
- if (ferror(out))
- printf("Write failed\n");
- else
- printf("Short write\n");
- goto cleanup;
- }
-
- }
- *size_in = count_in;
- *size_out = count_out;
- r = 0;
- cleanup:
- free(src);
- free(buf);
- return r;
-}
-
-static size_t decompress_file(FILE *in, FILE *out) {
- void *src = malloc(BUF_SIZE);
- void *dst = NULL;
- size_t dst_capacity = BUF_SIZE;
- size_t ret = 1;
- size_t bytes_written = 0;
-
- if (!src) {
- perror("decompress_file(src)");
- goto cleanup;
- }
-
- while (ret != 0) {
- /* Load more input */
- size_t src_size = fread(src, 1, BUF_SIZE, in);
- void *src_ptr = src;
- void *src_end = src_ptr + src_size;
- if (src_size == 0 || ferror(in)) {
- printf("(TODO): Decompress: not enough input or error reading file\n");
- //TODO
- ret = 0;
- goto cleanup;
- }
-
- /* Allocate destination buffer if it hasn't been allocated already */
- if (!dst) {
- dst = malloc(dst_capacity);
- if (!dst) {
- perror("decompress_file(dst)");
- goto cleanup;
- }
- }
-
- // TODO
-
- /* Decompress:
- * Continue while there is more input to read.
- */
- while (src_ptr != src_end && ret != 0) {
- // size_t dst_size = src_size;
- size_t dst_size = LDM_decompress(src, dst, src_size, dst_capacity);
- size_t written = fwrite(dst, 1, dst_size, out);
-// printf("Writing %zu bytes\n", dst_size);
- bytes_written += dst_size;
- if (written != dst_size) {
- printf("Decompress: Failed to write to file\n");
- goto cleanup;
- }
- src_ptr += src_size;
- src_size = src_end - src_ptr;
- }
-
- /* Update input */
-
- }
-
- printf("Wrote %zu bytes\n", bytes_written);
-
- cleanup:
- free(src);
- free(dst);
-
- return ret;
-}
-#endif
-
-static size_t compress(const char *fname, const char *oname) {
+/* Compress file given by fname and output to oname.
+ * Returns 0 if successful, error code otherwise.
+ */
+static int compress(const char *fname, const char *oname) {
int fdin, fdout;
struct stat statbuf;
char *src, *dst;
- /* open the input file */
+ /* Open the input file. */
if ((fdin = open(fname, O_RDONLY)) < 0) {
perror("Error in file opening");
return 1;
}
- /* open the output file */
+ /* Open the output file. */
if ((fdout = open(oname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600)) < 0) {
perror("Can't create output file");
return 1;
}
- /* find size of input file */
+ /* Find the size of the input file. */
if (fstat (fdin, &statbuf) < 0) {
perror("Fstat error");
return 1;
}
- size_t size_in = statbuf.st_size;
- /* go to the location corresponding to the last byte */
- if (lseek(fdout, size_in + LDM_HEADER_SIZE - 1, SEEK_SET) == -1) {
+ size_t maxCompressSize = statbuf.st_size + LDM_HEADER_SIZE;
+
+ /* Go to the location corresponding to the last byte. */
+ /* TODO: fallocate? */
+ if (lseek(fdout, maxCompressSize - 1, SEEK_SET) == -1) {
perror("lseek error");
return 1;
- }
+ }
- /* write a dummy byte at the last location */
- if (write(fdout, "", 1) != 1) {
- perror("write error");
- return 1;
- }
+ /* Write a dummy byte at the last location. */
+ if (write(fdout, "", 1) != 1) {
+ perror("write error");
+ return 1;
+ }
- /* mmap the input file */
+ /* mmap the input file. */
if ((src = mmap(0, statbuf.st_size, PROT_READ, MAP_SHARED, fdin, 0))
== (caddr_t) - 1) {
perror("mmap error for input");
return 1;
}
- size_t out_size = statbuf.st_size + LDM_HEADER_SIZE;
/* mmap the output file */
- if ((dst = mmap(0, out_size, PROT_READ | PROT_WRITE,
+ if ((dst = mmap(0, maxCompressSize, PROT_READ | PROT_WRITE,
MAP_SHARED, fdout, 0)) == (caddr_t) - 1) {
perror("mmap error for output");
return 1;
}
- #ifdef ZSTD
- size_t size_out = ZSTD_compress(dst, statbuf.st_size,
- src, statbuf.st_size, 1);
- #else
- size_t size_out = LDM_compress(src, dst + LDM_HEADER_SIZE, statbuf.st_size,
- statbuf.st_size);
- size_out += LDM_HEADER_SIZE;
+#ifdef ZSTD
+ size_t compressSize = ZSTD_compress(dst, statbuf.st_size,
+ src, statbuf.st_size, 1);
+#else
+ size_t compressSize = LDM_HEADER_SIZE +
+ LDM_compress(src, statbuf.st_size,
+ dst + LDM_HEADER_SIZE, statbuf.st_size);
+ // Write compress and decompress size to header
// TODO: should depend on LDM_DECOMPRESS_SIZE write32
- memcpy(dst, &size_out, 4);
- memcpy(dst + 4, &(statbuf.st_size), 4);
- printf("Compressed size: %zu\n", size_out);
- printf("Decompressed size: %zu\n", statbuf.st_size);
- #endif
- ftruncate(fdout, size_out);
+ memcpy(dst, &compressSize, 4);
+ memcpy(dst + 4, &(statbuf.st_size), 4);
+
+#ifdef DEBUG
+ printf("Compressed size: %zu\n", compressSize);
+ printf("Decompressed size: %zu\n", statbuf.st_size);
+#endif
+#endif
+
+ // Truncate file to compressSize.
+ ftruncate(fdout, compressSize);
printf("%25s : %6u -> %7u - %s (%.1f%%)\n", fname,
- (unsigned)statbuf.st_size, (unsigned)size_out, oname,
- (double)size_out / (statbuf.st_size) * 100);
+ (unsigned)statbuf.st_size, (unsigned)compressSize, oname,
+ (double)compressSize / (statbuf.st_size) * 100);
+ // Close files.
close(fdin);
close(fdout);
return 0;
}
-static size_t decompress(const char *fname, const char *oname) {
+/* Decompress file compressed using LDM_compress.
+ * The input file should have the LDM_HEADER followed by payload.
+ * Returns 0 if succesful, and an error code otherwise.
+ */
+static int decompress(const char *fname, const char *oname) {
int fdin, fdout;
struct stat statbuf;
char *src, *dst;
- /* open the input file */
+ /* Open the input file. */
if ((fdin = open(fname, O_RDONLY)) < 0) {
perror("Error in file opening");
return 1;
}
- /* open the output file */
+ /* Open the output file. */
if ((fdout = open(oname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600)) < 0) {
perror("Can't create output file");
return 1;
}
- /* find size of input file */
+ /* Find the size of the input file. */
if (fstat (fdin, &statbuf) < 0) {
perror("Fstat error");
return 1;
}
- /* mmap the input file */
+ /* mmap the input file. */
if ((src = mmap(0, statbuf.st_size, PROT_READ, MAP_SHARED, fdin, 0))
== (caddr_t) - 1) {
perror("mmap error for input");
return 1;
}
- /* read header */
- size_t compressed_size, decompressed_size;
- LDM_read_header(src, &compressed_size, &decompressed_size);
+ /* Read the header. */
+ size_t compressSize, decompressSize;
+ LDM_read_header(src, &compressSize, &decompressSize);
- printf("Size, compressed_size, decompressed_size: %zu %zu %zu\n",
- statbuf.st_size, compressed_size, decompressed_size);
+#ifdef DEBUG
+ printf("Size, compressSize, decompressSize: %zu %zu %zu\n",
+ statbuf.st_size, compressSize, decompressSize);
+#endif
- /* go to the location corresponding to the last byte */
- if (lseek(fdout, decompressed_size - 1, SEEK_SET) == -1) {
+ /* Go to the location corresponding to the last byte. */
+ if (lseek(fdout, decompressSize - 1, SEEK_SET) == -1) {
perror("lseek error");
return 1;
}
}
/* mmap the output file */
- if ((dst = mmap(0, decompressed_size, PROT_READ | PROT_WRITE,
+ if ((dst = mmap(0, decompressSize, PROT_READ | PROT_WRITE,
MAP_SHARED, fdout, 0)) == (caddr_t) - 1) {
perror("mmap error for output");
return 1;
}
- /* Copy input file to output file */
-// memcpy(dst, src, statbuf.st_size);
-
- #ifdef ZSTD
- size_t size_out = ZSTD_decompress(dst, decomrpessed_size,
- src + LDM_HEADER_SIZE,
- statbuf.st_size - LDM_HEADER_SIZE);
- #else
- size_t size_out = LDM_decompress(src + LDM_HEADER_SIZE, dst,
- statbuf.st_size - LDM_HEADER_SIZE,
- decompressed_size);
- printf("Ret size out: %zu\n", size_out);
+#ifdef ZSTD
+ size_t outSize = ZSTD_decompress(dst, decomrpessed_size,
+ src + LDM_HEADER_SIZE,
+ statbuf.st_size - LDM_HEADER_SIZE);
+#else
+ size_t outSize = LDM_decompress(
+ src + LDM_HEADER_SIZE, statbuf.st_size - LDM_HEADER_SIZE,
+ dst, decompressSize);
+
+ printf("Ret size out: %zu\n", outSize);
#endif
- ftruncate(fdout, size_out);
+ ftruncate(fdout, outSize);
close(fdin);
close(fdout);
return 0;
}
+/* Compare two files.
+ * Returns 0 iff they are the same.
+ */
static int compare(FILE *fp0, FILE *fp1) {
int result = 0;
while (result == 0) {
result = (int)r0 - (int)r1;
- if (0 == r0 || 0 == r1) {
- break;
- }
- if (0 == result) {
- result = memcmp(b0, b1, r0);
- }
+ if (0 == r0 || 0 == r1) break;
+
+ if (0 == result) result = memcmp(b0, b1, r0);
}
return result;
}
+/* Verify the input file is the same as the decompressed file. */
static void verify(const char *inpFilename, const char *decFilename) {
FILE *inpFp = fopen(inpFilename, "rb");
FILE *decFp = fopen(decFilename, "rb");
printf("dec = [%s]\n", decFilename);
struct timeval tv1, tv2;
- /* compress */
- {
+
+ /* Compress */
+
gettimeofday(&tv1, NULL);
if (compress(inpFilename, ldmFilename)) {
printf("Compress error");
printf("Total time = %f seconds\n",
(double) (tv2.tv_usec - tv1.tv_usec) / 1000000 +
(double) (tv2.tv_sec - tv1.tv_sec));
- }
- /* decompress */
+ /* Decompress */
gettimeofday(&tv1, NULL);
if (decompress(ldmFilename, decFilename)) {
return 0;
}
+
#if 0
+static size_t compress_file(FILE *in, FILE *out, size_t *size_in,
+ size_t *size_out) {
+ char *src, *buf = NULL;
+ size_t r = 1;
+ size_t size, n, k, count_in = 0, count_out = 0, offset, frame_size = 0;
+
+ src = malloc(BUF_SIZE);
+ if (!src) {
+ printf("Not enough memory\n");
+ goto cleanup;
+ }
+
+ size = BUF_SIZE + LDM_HEADER_SIZE;
+ buf = malloc(size);
+ if (!buf) {
+ printf("Not enough memory\n");
+ goto cleanup;
+ }
+
+
+ for (;;) {
+ k = fread(src, 1, BUF_SIZE, in);
+ if (k == 0)
+ break;
+ count_in += k;
+
+ n = LDM_compress(src, buf, k, BUF_SIZE);
+
+ // n = k;
+ // offset += n;
+ offset = k;
+ count_out += k;
+
+// k = fwrite(src, 1, offset, out);
+
+ k = fwrite(buf, 1, offset, out);
+ if (k < offset) {
+ if (ferror(out))
+ printf("Write failed\n");
+ else
+ printf("Short write\n");
+ goto cleanup;
+ }
+
+ }
+ *size_in = count_in;
+ *size_out = count_out;
+ r = 0;
+ cleanup:
+ free(src);
+ free(buf);
+ return r;
+}
+
+static size_t decompress_file(FILE *in, FILE *out) {
+ void *src = malloc(BUF_SIZE);
+ void *dst = NULL;
+ size_t dst_capacity = BUF_SIZE;
+ size_t ret = 1;
+ size_t bytes_written = 0;
+
+ if (!src) {
+ perror("decompress_file(src)");
+ goto cleanup;
+ }
+
+ while (ret != 0) {
+ /* Load more input */
+ size_t src_size = fread(src, 1, BUF_SIZE, in);
+ void *src_ptr = src;
+ void *src_end = src_ptr + src_size;
+ if (src_size == 0 || ferror(in)) {
+ printf("(TODO): Decompress: not enough input or error reading file\n");
+ //TODO
+ ret = 0;
+ goto cleanup;
+ }
+
+ /* Allocate destination buffer if it hasn't been allocated already */
+ if (!dst) {
+ dst = malloc(dst_capacity);
+ if (!dst) {
+ perror("decompress_file(dst)");
+ goto cleanup;
+ }
+ }
+
+ // TODO
+
+ /* Decompress:
+ * Continue while there is more input to read.
+ */
+ while (src_ptr != src_end && ret != 0) {
+ // size_t dst_size = src_size;
+ size_t dst_size = LDM_decompress(src, dst, src_size, dst_capacity);
+ size_t written = fwrite(dst, 1, dst_size, out);
+// printf("Writing %zu bytes\n", dst_size);
+ bytes_written += dst_size;
+ if (written != dst_size) {
+ printf("Decompress: Failed to write to file\n");
+ goto cleanup;
+ }
+ src_ptr += src_size;
+ src_size = src_end - src_ptr;
+ }
+
+ /* Update input */
+
+ }
+
+ printf("Wrote %zu bytes\n", bytes_written);
+
+ cleanup:
+ free(src);
+ free(dst);
+
+ return ret;
+}
+
int main2(int argc, char *argv[]) {
char inpFilename[256] = { 0 };
char ldmFilename[256] = { 0 };
projects / thirdparty / zstd.git / commitdiff
