# include <sys/uio.h> /* for `struct iovec' */
#endif
+static int
+alloc_lzx_context(int write_resource_flags, struct wimlib_lzx_context **ctx_pp)
+{
+ struct wimlib_lzx_params params;
+ params.size_of_this = sizeof(params);
+ if (write_resource_flags & WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW)
+ params.algorithm = WIMLIB_LZX_ALGORITHM_SLOW;
+ else
+ params.algorithm = WIMLIB_LZX_ALGORITHM_FAST;
+ params.use_defaults = 1;
+ return wimlib_lzx_alloc_context(¶ms, ctx_pp);
+}
+
+static unsigned
+compress_chunk(const void * uncompressed_data,
+ unsigned uncompressed_len,
+ void *compressed_data,
+ int out_ctype,
+ struct wimlib_lzx_context *comp_ctx)
+{
+ switch (out_ctype) {
+ case WIMLIB_COMPRESSION_TYPE_XPRESS:
+ return wimlib_xpress_compress(uncompressed_data,
+ uncompressed_len,
+ compressed_data);
+ case WIMLIB_COMPRESSION_TYPE_LZX:
+ return wimlib_lzx_compress2(uncompressed_data,
+ uncompressed_len,
+ compressed_data,
+ comp_ctx);
+ default:
+ wimlib_assert(0);
+ return 0;
+ }
+}
+
/* Chunk table that's located at the beginning of each compressed resource in
* the WIM. (This is not the on-disk format; the on-disk format just has an
* array of offsets.) */
}
}
-/*
- * compress_func_t- Pointer to a function to compresses a chunk
- * of a WIM resource. This may be either
- * wimlib_xpress_compress() (xpress-compress.c) or
- * wimlib_lzx_compress() (lzx-compress.c).
- *
- * @chunk: Uncompressed data of the chunk.
- * @chunk_size: Size of the uncompressed chunk, in bytes.
- * @out: Pointer to output buffer of size at least (@chunk_size - 1) bytes.
- *
- * Returns the size of the compressed data written to @out in bytes, or 0 if the
- * data could not be compressed to (@chunk_size - 1) bytes or fewer.
- *
- * As a special requirement, the compression code is optimized for the WIM
- * format and therefore requires (@chunk_size <= 32768).
- *
- * As another special requirement, the compression code will read up to 8 bytes
- * off the end of the @chunk array for performance reasons. The values of these
- * bytes will not affect the output of the compression, but the calling code
- * must make sure that the buffer holding the uncompressed chunk is actually at
- * least (@chunk_size + 8) bytes, or at least that these extra bytes are in
- * mapped memory that will not cause a memory access violation if accessed.
- */
-typedef unsigned (*compress_func_t)(const void *chunk, unsigned chunk_size,
- void *out);
-
-static compress_func_t
-get_compress_func(int out_ctype)
-{
- if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX)
- return wimlib_lzx_compress;
- else
- return wimlib_xpress_compress;
-}
-
/* Finishes a WIM chunk table and writes it to the output file at the correct
* offset. */
static int
}
struct write_resource_ctx {
- compress_func_t compress;
+ int out_ctype;
+ struct wimlib_lzx_context *comp_ctx;
struct chunk_table *chunk_tab;
struct filedes *out_fd;
SHA_CTX sha_ctx;
out_chunk = chunk;
out_chunk_size = chunk_size;
- if (ctx->compress) {
+ if (ctx->out_ctype != WIMLIB_COMPRESSION_TYPE_NONE) {
void *compressed_chunk;
unsigned compressed_size;
/* Compress the chunk. */
compressed_chunk = alloca(chunk_size);
- compressed_size = (*ctx->compress)(chunk, chunk_size,
- compressed_chunk);
+ compressed_size = compress_chunk(chunk, chunk_size,
+ compressed_chunk,
+ ctx->out_ctype,
+ ctx->comp_ctx);
/* Use compressed data if compression to less than input size
* was successful. */
if (compressed_size) {
* On success, this is filled in with the offset, flags, compressed size,
* and uncompressed size of the resource in the output WIM.
*
- * @write_resource_flags:
+ * @resource_flags:
* * WIMLIB_WRITE_RESOURCE_FLAG_RECOMPRESS to force data to be recompressed even
* if it could otherwise be copied directly from the input;
+ * * WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW to compress the data as much
+ * as possible;
* * WIMLIB_WRITE_RESOURCE_FLAG_PIPABLE if writing a resource for a pipable WIM
* (and the output file descriptor may be a pipe).
*
+ * @comp_ctx:
+ * Location of LZX compression context pointer, which will be allocated or
+ * updated if needed. (Initialize to NULL.)
+ *
* Additional notes: The SHA1 message digest of the uncompressed data is
* calculated (except when doing a raw copy --- see below). If the @unhashed
* flag is set on the lookup table entry, this message digest is simply copied
write_wim_resource(struct wim_lookup_table_entry *lte,
struct filedes *out_fd, int out_ctype,
struct resource_entry *out_res_entry,
- int resource_flags)
+ int resource_flags,
+ struct wimlib_lzx_context **comp_ctx)
{
struct write_resource_ctx write_ctx;
off_t res_start_offset;
read_size = lte->resource_entry.original_size;
}
+
/* If the output resource is to be compressed, initialize the chunk
* table and set the function to use for chunk compression. Exceptions:
* no compression function is needed if doing a raw copy; also, no chunk
* table is needed if doing a *full* (not per-chunk) raw copy. */
- write_ctx.compress = NULL;
+ write_ctx.out_ctype = WIMLIB_COMPRESSION_TYPE_NONE;
write_ctx.chunk_tab = NULL;
if (out_ctype != WIMLIB_COMPRESSION_TYPE_NONE) {
- if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW))
- write_ctx.compress = get_compress_func(out_ctype);
+ if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW)) {
+ write_ctx.out_ctype = out_ctype;
+ if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) {
+ ret = alloc_lzx_context(resource_flags, comp_ctx);
+ if (ret)
+ goto out;
+ }
+ write_ctx.comp_ctx = *comp_ctx;
+ }
if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW_FULL)) {
ret = begin_wim_resource_chunk_tab(lte, out_fd,
&write_ctx.chunk_tab,
goto out_free_chunk_tab;
out_ctype = WIMLIB_COMPRESSION_TYPE_NONE;
FREE(write_ctx.chunk_tab);
- write_ctx.compress = NULL;
+ write_ctx.out_ctype = WIMLIB_COMPRESSION_TYPE_NONE;
write_ctx.chunk_tab = NULL;
write_ctx.doing_sha = false;
goto try_write_again;
int reshdr_flags, struct filedes *out_fd,
int out_ctype,
struct resource_entry *out_res_entry,
- u8 *hash_ret, int write_resource_flags)
+ u8 *hash_ret, int write_resource_flags,
+ struct wimlib_lzx_context **comp_ctx)
{
/* Set up a temporary lookup table entry to provide to
* write_wim_resource(). */
}
ret = write_wim_resource(<e, out_fd, out_ctype, out_res_entry,
- write_resource_flags);
+ write_resource_flags, comp_ctx);
if (ret)
return ret;
if (hash_ret)
struct compressor_thread_params {
struct shared_queue *res_to_compress_queue;
struct shared_queue *compressed_res_queue;
- compress_func_t compress;
+ int out_ctype;
+ struct wimlib_lzx_context *comp_ctx;
};
#define MAX_CHUNKS_PER_MSG 2
};
static void
-compress_chunks(struct message *msg, compress_func_t compress)
+compress_chunks(struct message *msg, int out_ctype,
+ struct wimlib_lzx_context *comp_ctx)
{
for (unsigned i = 0; i < msg->num_chunks; i++) {
- unsigned len = compress(msg->uncompressed_chunks[i],
- msg->uncompressed_chunk_sizes[i],
- msg->compressed_chunks[i]);
+ unsigned len;
+
+ len = compress_chunk(msg->uncompressed_chunks[i],
+ msg->uncompressed_chunk_sizes[i],
+ msg->compressed_chunks[i],
+ out_ctype,
+ comp_ctx);
+
void *out_chunk;
unsigned out_len;
if (len) {
struct compressor_thread_params *params = arg;
struct shared_queue *res_to_compress_queue = params->res_to_compress_queue;
struct shared_queue *compressed_res_queue = params->compressed_res_queue;
- compress_func_t compress = params->compress;
struct message *msg;
DEBUG("Compressor thread ready");
while ((msg = shared_queue_get(res_to_compress_queue)) != NULL) {
- compress_chunks(msg, compress);
+ compress_chunks(msg, params->out_ctype, params->comp_ctx);
shared_queue_put(compressed_res_queue, msg);
}
DEBUG("Compressor thread terminating");
struct serial_write_stream_ctx {
struct filedes *out_fd;
int out_ctype;
+ struct wimlib_lzx_context **comp_ctx;
int write_resource_flags;
};
struct serial_write_stream_ctx *ctx = _ctx;
return write_wim_resource(lte, ctx->out_fd,
ctx->out_ctype, <e->output_resource_entry,
- ctx->write_resource_flags);
+ ctx->write_resource_flags,
+ ctx->comp_ctx);
}
struct wim_lookup_table *lookup_table,
struct filedes *out_fd,
int out_ctype,
+ struct wimlib_lzx_context **comp_ctx,
int write_resource_flags,
struct write_streams_progress_data *progress_data)
{
.out_fd = out_fd,
.out_ctype = out_ctype,
.write_resource_flags = write_resource_flags,
+ .comp_ctx = comp_ctx,
};
return do_write_stream_list(stream_list,
lookup_table,
if (write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS)
resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_RECOMPRESS;
+ if (write_flags & WIMLIB_WRITE_FLAG_COMPRESS_SLOW)
+ resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW;
if (write_flags & WIMLIB_WRITE_FLAG_PIPABLE)
resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_PIPABLE;
return resource_flags;
struct wim_lookup_table *lookup_table,
struct filedes *out_fd,
int out_ctype,
+ struct wimlib_lzx_context **comp_ctx,
int write_resource_flags,
struct write_streams_progress_data *progress_data)
{
lookup_table,
out_fd,
out_ctype,
+ comp_ctx,
write_resource_flags,
progress_data);
}
struct filedes *out_fd;
off_t res_start_offset;
int out_ctype;
+ struct wimlib_lzx_context **comp_ctx;
int write_resource_flags;
struct shared_queue *res_to_compress_queue;
struct shared_queue *compressed_res_queue;
ctx->out_fd,
WIMLIB_COMPRESSION_TYPE_NONE,
&cur_lte->output_resource_entry,
- ctx->write_resource_flags);
+ ctx->write_resource_flags,
+ ctx->comp_ctx);
if (ret)
return ret;
} else {
ctx->lookup_table,
ctx->out_fd,
ctx->out_ctype,
+ ctx->comp_ctx,
ctx->write_resource_flags,
ctx->progress_data);
if (ret)
ctx->lookup_table,
ctx->out_fd,
ctx->out_ctype,
+ ctx->comp_ctx,
ctx->write_resource_flags,
ctx->progress_data);
}
struct wim_lookup_table *lookup_table,
struct filedes *out_fd,
int out_ctype,
+ struct wimlib_lzx_context **comp_ctx,
int write_resource_flags,
struct write_streams_progress_data *progress_data,
unsigned num_threads)
if (ret)
goto out_destroy_res_to_compress_queue;
- struct compressor_thread_params params;
- params.res_to_compress_queue = &res_to_compress_queue;
- params.compressed_res_queue = &compressed_res_queue;
- params.compress = get_compress_func(out_ctype);
+ struct compressor_thread_params *params;
+
+ params = CALLOC(num_threads, sizeof(params[0]));
+ if (params == NULL) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_destroy_compressed_res_queue;
+ }
+
+ for (unsigned i = 0; i < num_threads; i++) {
+ params[i].res_to_compress_queue = &res_to_compress_queue;
+ params[i].compressed_res_queue = &compressed_res_queue;
+ params[i].out_ctype = out_ctype;
+ if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) {
+ ret = alloc_lzx_context(write_resource_flags,
+ ¶ms[i].comp_ctx);
+ if (ret)
+ goto out_free_params;
+ }
+ }
compressor_threads = MALLOC(num_threads * sizeof(pthread_t));
if (!compressor_threads) {
ret = WIMLIB_ERR_NOMEM;
- goto out_destroy_compressed_res_queue;
+ goto out_free_params;
}
for (unsigned i = 0; i < num_threads; i++) {
DEBUG("pthread_create thread %u of %u", i + 1, num_threads);
ret = pthread_create(&compressor_threads[i], NULL,
- compressor_thread_proc, ¶ms);
+ compressor_thread_proc, ¶ms[i]);
if (ret != 0) {
ret = -1;
ERROR_WITH_ERRNO("Failed to create compressor "
ctx.lookup_table = lookup_table;
ctx.out_fd = out_fd;
ctx.out_ctype = out_ctype;
+ ctx.comp_ctx = comp_ctx;
ctx.res_to_compress_queue = &res_to_compress_queue;
ctx.compressed_res_queue = &compressed_res_queue;
ctx.num_messages = queue_size;
}
}
FREE(compressor_threads);
+out_free_params:
+ for (unsigned i = 0; i < num_threads; i++)
+ wimlib_lzx_free_context(params[i].comp_ctx);
+ FREE(params);
out_destroy_compressed_res_queue:
shared_queue_destroy(&compressed_res_queue);
out_destroy_res_to_compress_queue:
lookup_table,
out_fd,
out_ctype,
+ comp_ctx,
write_resource_flags,
progress_data);
static int
write_stream_list(struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
- struct filedes *out_fd, int out_ctype, int write_flags,
+ struct filedes *out_fd, int out_ctype,
+ struct wimlib_lzx_context **comp_ctx,
+ int write_flags,
unsigned num_threads, wimlib_progress_func_t progress_func)
{
struct wim_lookup_table_entry *lte;
lookup_table,
out_fd,
out_ctype,
+ comp_ctx,
write_resource_flags,
&progress_data,
num_threads);
lookup_table,
out_fd,
out_ctype,
+ comp_ctx,
write_resource_flags,
&progress_data);
if (ret == 0)
wim->lookup_table,
&wim->out_fd,
wim->compression_type,
+ &wim->lzx_context,
write_flags,
num_threads,
progress_func);
&wim->out_fd,
wim->compression_type,
&imd->metadata_lte->output_resource_entry,
- write_resource_flags);
+ write_resource_flags,
+ &wim->lzx_context);
}
if (ret)
return ret;
wim->lookup_table,
&wim->out_fd,
wim->compression_type,
+ &wim->lzx_context,
write_flags,
num_threads,
progress_func);
ret = wimlib_write(wim, tmpfile, WIMLIB_ALL_IMAGES,
write_flags | WIMLIB_WRITE_FLAG_FSYNC,
num_threads, progress_func);
- if (ret)
- goto out_unlink;
+ if (ret) {
+ tunlink(tmpfile);
+ return ret;
+ }
close_wim(wim);
+ /* Rename the new WIM file to the original WIM file. Note: on Windows
+ * this actually calls win32_rename_replacement(), not _wrename(), so
+ * that removing the existing destination file can be handled. */
DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, wim->filename);
- /* Rename the new file to the old file .*/
- if (trename(tmpfile, wim->filename) != 0) {
+ ret = trename(tmpfile, wim->filename);
+ if (ret) {
ERROR_WITH_ERRNO("Failed to rename `%"TS"' to `%"TS"'",
tmpfile, wim->filename);
- ret = WIMLIB_ERR_RENAME;
- goto out_unlink;
+ #ifdef __WIN32__
+ if (ret < 0)
+ #endif
+ {
+ tunlink(tmpfile);
+ }
+ return WIMLIB_ERR_RENAME;
}
if (progress_func) {
progress_func(WIMLIB_PROGRESS_MSG_RENAME, &progress);
}
return 0;
-
-out_unlink:
- /* Remove temporary file. */
- tunlink(tmpfile);
- return ret;
}
/* API function documented in wimlib.h */
git://wimlib.net / wimlib / blobdiff