X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=4c68921cc9164efb926e58325f0e0a99109ec6bc;hp=b4d0f0d7d891b372f0f383a82a9466990a5d69ee;hb=58daaca96dc8b23e345342e844c58b1972e5fedf;hpb=24b70d77c3d41a78a5fa78acb0e8ca3edcdd5956 diff --git a/src/write.c b/src/write.c index b4d0f0d7..4c68921c 100644 --- a/src/write.c +++ b/src/write.c @@ -24,30 +24,37 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK) -/* On BSD, this should be included before "list.h" so that "list.h" can +/* On BSD, this should be included before "wimlib/list.h" so that "wimlib/list.h" can * overwrite the LIST_HEAD macro. */ # include #endif +#include "wimlib/endianness.h" +#include "wimlib/error.h" +#include "wimlib/file_io.h" +#include "wimlib/header.h" +#include "wimlib/integrity.h" +#include "wimlib/lookup_table.h" +#include "wimlib/metadata.h" +#include "wimlib/resource.h" +#include "wimlib/write.h" +#include "wimlib/xml.h" + #ifdef __WIN32__ -# include "win32.h" +# include "wimlib/win32.h" /* win32_get_number_of_processors() */ #endif -#include "list.h" -#include "wimlib_internal.h" -#include "buffer_io.h" -#include "dentry.h" -#include "lookup_table.h" -#include "xml.h" - #ifdef ENABLE_MULTITHREADED_COMPRESSION # include #endif #include +#include #include #ifdef WITH_NTFS_3G @@ -65,8 +72,8 @@ #include -#if defined(__WIN32__) && !defined(INVALID_HANDLE_VALUE) -# define INVALID_HANDLE_VALUE ((HANDLE)(-1)) +#ifndef __WIN32__ +# include /* for `struct iovec' */ #endif /* Chunk table that's located at the beginning of each compressed resource in @@ -74,13 +81,19 @@ * array of offsets.) */ struct chunk_table { off_t file_offset; - u64 num_chunks; u64 original_resource_size; - u64 bytes_per_chunk_entry; + u64 num_chunks; u64 table_disk_size; - u64 cur_offset; - u64 *cur_offset_p; - u64 offsets[0]; + unsigned bytes_per_chunk_entry; + void *cur_offset_p; + union { + u32 cur_offset_u32; + u64 cur_offset_u64; + }; + /* Beginning of chunk offsets, in either 32-bit or 64-bit little endian + * integers, including the first offset of 0, which will not be written. + * */ + u8 offsets[] _aligned_attribute(8); }; /* @@ -89,15 +102,18 @@ struct chunk_table { */ static int begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte, - FILE *out_fp, + int out_fd, off_t file_offset, struct chunk_table **chunk_tab_ret) { u64 size = wim_resource_size(lte); - u64 num_chunks = (size + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE; + u64 num_chunks = wim_resource_chunks(lte); + unsigned bytes_per_chunk_entry = (size > (1ULL << 32)) ? 8 : 4; size_t alloc_size = sizeof(struct chunk_table) + num_chunks * sizeof(u64); struct chunk_table *chunk_tab = CALLOC(1, alloc_size); + DEBUG("Beginning chunk table for stream with size %"PRIu64, size); + if (!chunk_tab) { ERROR("Failed to allocate chunk table for %"PRIu64" byte " "resource", size); @@ -106,14 +122,17 @@ begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte, chunk_tab->file_offset = file_offset; chunk_tab->num_chunks = num_chunks; chunk_tab->original_resource_size = size; - chunk_tab->bytes_per_chunk_entry = (size >= (1ULL << 32)) ? 8 : 4; + chunk_tab->bytes_per_chunk_entry = bytes_per_chunk_entry; chunk_tab->table_disk_size = chunk_tab->bytes_per_chunk_entry * (num_chunks - 1); - chunk_tab->cur_offset = 0; chunk_tab->cur_offset_p = chunk_tab->offsets; - if (fwrite(chunk_tab, 1, chunk_tab->table_disk_size, out_fp) != - chunk_tab->table_disk_size) { + /* We don't know the correct offsets yet; this just writes zeroes to + * reserve space for the table, so we can go back to it later after + * we've written the compressed chunks following it. */ + if (full_write(out_fd, chunk_tab->offsets, + chunk_tab->table_disk_size) != chunk_tab->table_disk_size) + { ERROR_WITH_ERRNO("Failed to write chunk table in compressed " "file resource"); FREE(chunk_tab); @@ -123,6 +142,22 @@ begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte, return 0; } +/* Add the offset for the next chunk to the chunk table being constructed for a + * compressed stream. */ +static void +chunk_tab_record_chunk(struct chunk_table *chunk_tab, unsigned out_chunk_size) +{ + if (chunk_tab->bytes_per_chunk_entry == 4) { + *(le32*)chunk_tab->cur_offset_p = cpu_to_le32(chunk_tab->cur_offset_u32); + chunk_tab->cur_offset_p = (le32*)chunk_tab->cur_offset_p + 1; + chunk_tab->cur_offset_u32 += out_chunk_size; + } else { + *(le64*)chunk_tab->cur_offset_p = cpu_to_le64(chunk_tab->cur_offset_u64); + chunk_tab->cur_offset_p = (le64*)chunk_tab->cur_offset_p + 1; + chunk_tab->cur_offset_u64 += out_chunk_size; + } +} + /* * compress_func_t- Pointer to a function to compresses a chunk * of a WIM resource. This may be either @@ -163,7 +198,7 @@ get_compress_func(int out_ctype) * * @chunk: Uncompressed data of the chunk. * @chunk_size: Size of the chunk (<= WIM_CHUNK_SIZE) - * @out_fp: FILE * to write the chunk to. + * @out_fd: File descriptor to write the chunk to. * @compress: Compression function to use (NULL if writing uncompressed * data). * @chunk_tab: Pointer to chunk table being created. It is updated with the @@ -172,16 +207,18 @@ get_compress_func(int out_ctype) * Returns 0 on success; nonzero on failure. */ static int -write_wim_resource_chunk(const void *chunk, unsigned chunk_size, - FILE *out_fp, compress_func_t compress, - struct chunk_table *chunk_tab) +write_wim_resource_chunk(const void * restrict chunk, + unsigned chunk_size, + int out_fd, + compress_func_t compress, + struct chunk_table * restrict chunk_tab) { - const u8 *out_chunk; + const void *out_chunk; unsigned out_chunk_size; if (compress) { - u8 *compressed_chunk = alloca(chunk_size); + void *compressed_chunk = alloca(chunk_size); - out_chunk_size = compress(chunk, chunk_size, compressed_chunk); + out_chunk_size = (*compress)(chunk, chunk_size, compressed_chunk); if (out_chunk_size) { /* Write compressed */ out_chunk = compressed_chunk; @@ -190,14 +227,13 @@ write_wim_resource_chunk(const void *chunk, unsigned chunk_size, out_chunk = chunk; out_chunk_size = chunk_size; } - *chunk_tab->cur_offset_p++ = chunk_tab->cur_offset; - chunk_tab->cur_offset += out_chunk_size; + chunk_tab_record_chunk(chunk_tab, out_chunk_size); } else { /* Write uncompressed */ out_chunk = chunk; out_chunk_size = chunk_size; } - if (fwrite(out_chunk, 1, out_chunk_size, out_fp) != out_chunk_size) { + if (full_write(out_fd, out_chunk, out_chunk_size) != out_chunk_size) { ERROR_WITH_ERRNO("Failed to write WIM resource chunk"); return WIMLIB_ERR_WRITE; } @@ -213,47 +249,33 @@ write_wim_resource_chunk(const void *chunk, unsigned chunk_size, */ static int finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab, - FILE *out_fp, u64 *compressed_size_p) + int out_fd, u64 *compressed_size_p) { size_t bytes_written; - if (fseeko(out_fp, chunk_tab->file_offset, SEEK_SET) != 0) { - ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" of output " - "WIM file", chunk_tab->file_offset); - return WIMLIB_ERR_WRITE; - } - if (chunk_tab->bytes_per_chunk_entry == 8) { - array_cpu_to_le64(chunk_tab->offsets, chunk_tab->num_chunks); - } else { - for (u64 i = 0; i < chunk_tab->num_chunks; i++) - ((u32*)chunk_tab->offsets)[i] = - cpu_to_le32(chunk_tab->offsets[i]); - } - bytes_written = fwrite((u8*)chunk_tab->offsets + - chunk_tab->bytes_per_chunk_entry, - 1, chunk_tab->table_disk_size, out_fp); + bytes_written = full_pwrite(out_fd, + chunk_tab->offsets + chunk_tab->bytes_per_chunk_entry, + chunk_tab->table_disk_size, + chunk_tab->file_offset); if (bytes_written != chunk_tab->table_disk_size) { ERROR_WITH_ERRNO("Failed to write chunk table in compressed " "file resource"); return WIMLIB_ERR_WRITE; } - if (fseeko(out_fp, 0, SEEK_END) != 0) { - ERROR_WITH_ERRNO("Failed to seek to end of output WIM file"); - return WIMLIB_ERR_WRITE; - } - *compressed_size_p = chunk_tab->cur_offset + chunk_tab->table_disk_size; + if (chunk_tab->bytes_per_chunk_entry == 4) + *compressed_size_p = chunk_tab->cur_offset_u32 + chunk_tab->table_disk_size; + else + *compressed_size_p = chunk_tab->cur_offset_u64 + chunk_tab->table_disk_size; return 0; } static int -fflush_and_ftruncate(FILE *out_fp, off_t offset) +seek_and_truncate(int out_fd, off_t offset) { - if (fseeko(out_fp, offset, SEEK_SET) || - fflush(out_fp) || - ftruncate(fileno(out_fp), offset)) + if (lseek(out_fd, offset, SEEK_SET) == -1 || + ftruncate(out_fd, offset)) { - ERROR_WITH_ERRNO("Failed to flush and/or truncate " - "output WIM file"); + ERROR_WITH_ERRNO("Failed to truncate output WIM file"); return WIMLIB_ERR_WRITE; } else { return 0; @@ -261,7 +283,8 @@ fflush_and_ftruncate(FILE *out_fp, off_t offset) } static int -finalize_and_check_sha1(SHA_CTX *sha_ctx, struct wim_lookup_table_entry *lte) +finalize_and_check_sha1(SHA_CTX * restrict sha_ctx, + struct wim_lookup_table_entry * restrict lte) { u8 md[SHA1_HASH_SIZE]; sha1_final(md, sha_ctx); @@ -283,31 +306,22 @@ finalize_and_check_sha1(SHA_CTX *sha_ctx, struct wim_lookup_table_entry *lte) struct write_resource_ctx { compress_func_t compress; struct chunk_table *chunk_tab; - FILE *out_fp; + int out_fd; SHA_CTX sha_ctx; bool doing_sha; }; static int -write_resource_cb(const void *chunk, size_t chunk_size, void *_ctx) +write_resource_cb(const void *restrict chunk, size_t chunk_size, + void *restrict _ctx) { struct write_resource_ctx *ctx = _ctx; if (ctx->doing_sha) sha1_update(&ctx->sha_ctx, chunk, chunk_size); - - if (ctx->compress) { - return write_wim_resource_chunk(chunk, chunk_size, - ctx->out_fp, ctx->compress, - ctx->chunk_tab); - } else { - if (fwrite(chunk, 1, chunk_size, ctx->out_fp) != chunk_size) { - ERROR_WITH_ERRNO("Error writing to output WIM"); - return WIMLIB_ERR_WRITE; - } else { - return 0; - } - } + return write_wim_resource_chunk(chunk, chunk_size, + ctx->out_fd, ctx->compress, + ctx->chunk_tab); } /* @@ -316,7 +330,7 @@ write_resource_cb(const void *chunk, size_t chunk_size, void *_ctx) * @lte: Lookup table entry for the resource, which could be in another WIM, * in an external file, or in another location. * - * @out_fp: FILE * opened to the output WIM. + * @out_fd: File descriptor opened to the output WIM. * * @out_ctype: One of the WIMLIB_COMPRESSION_TYPE_* constants to indicate * which compression algorithm to use. @@ -336,7 +350,7 @@ write_resource_cb(const void *chunk, size_t chunk_size, void *_ctx) */ int write_wim_resource(struct wim_lookup_table_entry *lte, - FILE *out_fp, int out_ctype, + int out_fd, int out_ctype, struct resource_entry *out_res_entry, int flags) { @@ -349,7 +363,7 @@ write_wim_resource(struct wim_lookup_table_entry *lte, flags &= ~WIMLIB_RESOURCE_FLAG_RECOMPRESS; /* Get current position in output WIM */ - offset = ftello(out_fp); + offset = filedes_offset(out_fd); if (offset == -1) { ERROR_WITH_ERRNO("Can't get position in output WIM"); return WIMLIB_ERR_WRITE; @@ -363,7 +377,7 @@ write_wim_resource(struct wim_lookup_table_entry *lte, if (!(flags & WIMLIB_RESOURCE_FLAG_RECOMPRESS) && lte->resource_location == RESOURCE_IN_WIM && out_ctype != WIMLIB_COMPRESSION_TYPE_NONE && - wimlib_get_compression_type(lte->wim) == out_ctype) + lte->wim->compression_type == out_ctype) { flags |= WIMLIB_RESOURCE_FLAG_RAW; write_ctx.doing_sha = false; @@ -382,7 +396,7 @@ write_wim_resource(struct wim_lookup_table_entry *lte, write_ctx.chunk_tab = NULL; } else { write_ctx.compress = get_compress_func(out_ctype); - ret = begin_wim_resource_chunk_tab(lte, out_fp, + ret = begin_wim_resource_chunk_tab(lte, out_fd, offset, &write_ctx.chunk_tab); if (ret) @@ -391,7 +405,7 @@ write_wim_resource(struct wim_lookup_table_entry *lte, /* Write the entire resource by reading the entire resource and feeding * the data through the write_resource_cb function. */ - write_ctx.out_fp = out_fp; + write_ctx.out_fd = out_fd; try_write_again: ret = read_resource_prefix(lte, read_size, write_resource_cb, &write_ctx, flags); @@ -422,7 +436,7 @@ try_write_again: /* Using a different compression type: Call * finish_wim_resource_chunk_tab() and it will provide the new * compressed size. */ - ret = finish_wim_resource_chunk_tab(write_ctx.chunk_tab, out_fp, + ret = finish_wim_resource_chunk_tab(write_ctx.chunk_tab, out_fd, &new_size); if (ret) goto out_free_chunk_tab; @@ -432,7 +446,7 @@ try_write_again: DEBUG("Compressed %"PRIu64" => %"PRIu64" bytes; " "writing uncompressed instead", wim_resource_size(lte), new_size); - ret = fflush_and_ftruncate(out_fp, offset); + ret = seek_and_truncate(out_fd, offset); if (ret) goto out_free_chunk_tab; write_ctx.compress = NULL; @@ -549,10 +563,10 @@ struct compressor_thread_params { struct message { struct wim_lookup_table_entry *lte; u8 *uncompressed_chunks[MAX_CHUNKS_PER_MSG]; - u8 *out_compressed_chunks[MAX_CHUNKS_PER_MSG]; u8 *compressed_chunks[MAX_CHUNKS_PER_MSG]; unsigned uncompressed_chunk_sizes[MAX_CHUNKS_PER_MSG]; - unsigned compressed_chunk_sizes[MAX_CHUNKS_PER_MSG]; + struct iovec out_chunks[MAX_CHUNKS_PER_MSG]; + size_t total_out_bytes; unsigned num_chunks; struct list_head list; bool complete; @@ -562,20 +576,25 @@ struct message { static void compress_chunks(struct message *msg, compress_func_t compress) { + msg->total_out_bytes = 0; 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]); + void *out_chunk; + unsigned out_len; if (len) { /* To be written compressed */ - msg->out_compressed_chunks[i] = msg->compressed_chunks[i]; - msg->compressed_chunk_sizes[i] = len; + out_chunk = msg->compressed_chunks[i]; + out_len = len; } else { /* To be written uncompressed */ - msg->out_compressed_chunks[i] = msg->uncompressed_chunks[i]; - msg->compressed_chunk_sizes[i] = msg->uncompressed_chunk_sizes[i]; - + out_chunk = msg->uncompressed_chunks[i]; + out_len = msg->uncompressed_chunk_sizes[i]; } + msg->out_chunks[i].iov_base = out_chunk; + msg->out_chunks[i].iov_len = out_len; + msg->total_out_bytes += out_len; } } @@ -606,9 +625,19 @@ compressor_thread_proc(void *arg) static void do_write_streams_progress(union wimlib_progress_info *progress, wimlib_progress_func_t progress_func, - uint64_t size_added) + uint64_t size_added, + bool stream_discarded) { - progress->write_streams.completed_bytes += size_added; + if (stream_discarded) { + progress->write_streams.total_bytes -= size_added; + if (progress->write_streams._private != ~(uint64_t)0 && + progress->write_streams._private > progress->write_streams.total_bytes) + { + progress->write_streams._private = progress->write_streams.total_bytes; + } + } else { + progress->write_streams.completed_bytes += size_added; + } progress->write_streams.completed_streams++; if (progress_func && progress->write_streams.completed_bytes >= progress->write_streams._private) @@ -616,7 +645,7 @@ do_write_streams_progress(union wimlib_progress_info *progress, progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS, progress); if (progress->write_streams._private == progress->write_streams.total_bytes) { - progress->write_streams._private = ~0; + progress->write_streams._private = ~(uint64_t)0; } else { progress->write_streams._private = min(progress->write_streams.total_bytes, @@ -627,7 +656,7 @@ do_write_streams_progress(union wimlib_progress_info *progress, } struct serial_write_stream_ctx { - FILE *out_fp; + int out_fd; int out_ctype; int write_resource_flags; }; @@ -636,7 +665,7 @@ static int serial_write_stream(struct wim_lookup_table_entry *lte, void *_ctx) { struct serial_write_stream_ctx *ctx = _ctx; - return write_wim_resource(lte, ctx->out_fp, + return write_wim_resource(lte, ctx->out_fd, ctx->out_ctype, <e->output_resource_entry, ctx->write_resource_flags); } @@ -655,9 +684,11 @@ do_write_stream_list(struct list_head *stream_list, { int ret = 0; struct wim_lookup_table_entry *lte; + bool stream_discarded; /* For each stream in @stream_list ... */ while (!list_empty(stream_list)) { + stream_discarded = false; lte = container_of(stream_list->next, struct wim_lookup_table_entry, write_streams_list); @@ -682,6 +713,7 @@ do_write_stream_list(struct list_head *stream_list, DEBUG("Discarding duplicate stream of length %"PRIu64, wim_resource_size(lte)); lte->no_progress = 0; + stream_discarded = true; goto skip_to_progress; } } @@ -713,7 +745,8 @@ do_write_stream_list(struct list_head *stream_list, if (!lte->no_progress) { do_write_streams_progress(progress, progress_func, - wim_resource_size(lte)); + wim_resource_size(lte), + stream_discarded); } } return ret; @@ -722,14 +755,14 @@ do_write_stream_list(struct list_head *stream_list, static int do_write_stream_list_serial(struct list_head *stream_list, struct wim_lookup_table *lookup_table, - FILE *out_fp, + int out_fd, int out_ctype, int write_resource_flags, wimlib_progress_func_t progress_func, union wimlib_progress_info *progress) { struct serial_write_stream_ctx ctx = { - .out_fp = out_fp, + .out_fd = out_fd, .out_ctype = out_ctype, .write_resource_flags = write_resource_flags, }; @@ -744,14 +777,17 @@ do_write_stream_list_serial(struct list_head *stream_list, static inline int write_flags_to_resource_flags(int write_flags) { - return (write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS) ? - WIMLIB_RESOURCE_FLAG_RECOMPRESS : 0; + int resource_flags = 0; + + if (write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS) + resource_flags |= WIMLIB_RESOURCE_FLAG_RECOMPRESS; + return resource_flags; } static int write_stream_list_serial(struct list_head *stream_list, struct wim_lookup_table *lookup_table, - FILE *out_fp, + int out_fd, int out_ctype, int write_resource_flags, wimlib_progress_func_t progress_func, @@ -763,7 +799,7 @@ write_stream_list_serial(struct list_head *stream_list, progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS, progress); return do_write_stream_list_serial(stream_list, lookup_table, - out_fp, + out_fd, out_ctype, write_resource_flags, progress_func, @@ -772,21 +808,16 @@ write_stream_list_serial(struct list_head *stream_list, #ifdef ENABLE_MULTITHREADED_COMPRESSION static int -write_wim_chunks(struct message *msg, FILE *out_fp, +write_wim_chunks(struct message *msg, int out_fd, struct chunk_table *chunk_tab) { - for (unsigned i = 0; i < msg->num_chunks; i++) { - unsigned chunk_csize = msg->compressed_chunk_sizes[i]; - - if (fwrite(msg->out_compressed_chunks[i], 1, chunk_csize, out_fp) - != chunk_csize) - { - ERROR_WITH_ERRNO("Failed to write WIM chunk"); - return WIMLIB_ERR_WRITE; - } - - *chunk_tab->cur_offset_p++ = chunk_tab->cur_offset; - chunk_tab->cur_offset += chunk_csize; + for (unsigned i = 0; i < msg->num_chunks; i++) + chunk_tab_record_chunk(chunk_tab, msg->out_chunks[i].iov_len); + if (full_writev(out_fd, msg->out_chunks, + msg->num_chunks) != msg->total_out_bytes) + { + ERROR_WITH_ERRNO("Failed to write WIM chunks"); + return WIMLIB_ERR_WRITE; } return 0; } @@ -794,7 +825,7 @@ write_wim_chunks(struct message *msg, FILE *out_fp, struct main_writer_thread_ctx { struct list_head *stream_list; struct wim_lookup_table *lookup_table; - FILE *out_fp; + int out_fd; int out_ctype; int write_resource_flags; struct shared_queue *res_to_compress_queue; @@ -950,11 +981,11 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) if (msg->begin_chunk == 0) { /* This is the first set of chunks. Leave space * for the chunk table in the output file. */ - off_t cur_offset = ftello(ctx->out_fp); + off_t cur_offset = filedes_offset(ctx->out_fd); if (cur_offset == -1) return WIMLIB_ERR_WRITE; ret = begin_wim_resource_chunk_tab(cur_lte, - ctx->out_fp, + ctx->out_fd, cur_offset, &ctx->cur_chunk_tab); if (ret) @@ -962,7 +993,7 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) } /* Write the compressed chunks from the message. */ - ret = write_wim_chunks(msg, ctx->out_fp, ctx->cur_chunk_tab); + ret = write_wim_chunks(msg, ctx->out_fd, ctx->cur_chunk_tab); if (ret) return ret; @@ -975,7 +1006,7 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) off_t offset; ret = finish_wim_resource_chunk_tab(ctx->cur_chunk_tab, - ctx->out_fp, + ctx->out_fd, &res_csize); if (ret) return ret; @@ -996,11 +1027,11 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) DEBUG("Compressed %"PRIu64" => %"PRIu64" bytes; " "writing uncompressed instead", wim_resource_size(cur_lte), res_csize); - ret = fflush_and_ftruncate(ctx->out_fp, offset); + ret = seek_and_truncate(ctx->out_fd, offset); if (ret) return ret; ret = write_wim_resource(cur_lte, - ctx->out_fp, + ctx->out_fd, WIMLIB_COMPRESSION_TYPE_NONE, &cur_lte->output_resource_entry, ctx->write_resource_flags); @@ -1023,7 +1054,8 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) do_write_streams_progress(ctx->progress, ctx->progress_func, - wim_resource_size(cur_lte)); + wim_resource_size(cur_lte), + false); /* Since we just finished writing a stream, write any * streams that have been added to the serial_streams @@ -1034,7 +1066,7 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) if (!list_empty(&ctx->serial_streams)) { ret = do_write_stream_list_serial(&ctx->serial_streams, ctx->lookup_table, - ctx->out_fp, + ctx->out_fd, ctx->out_ctype, ctx->write_resource_flags, ctx->progress_func, @@ -1133,7 +1165,7 @@ main_writer_thread_finish(void *_ctx) wimlib_assert(list_empty(&ctx->outstanding_streams)); return do_write_stream_list_serial(&ctx->serial_streams, ctx->lookup_table, - ctx->out_fp, + ctx->out_fd, ctx->out_ctype, ctx->write_resource_flags, ctx->progress_func, @@ -1175,7 +1207,7 @@ main_thread_process_next_stream(struct wim_lookup_table_entry *lte, void *_ctx) ctx->out_ctype == WIMLIB_COMPRESSION_TYPE_NONE || (lte->resource_location == RESOURCE_IN_WIM && !(ctx->write_resource_flags & WIMLIB_RESOURCE_FLAG_RECOMPRESS) && - wimlib_get_compression_type(lte->wim) == ctx->out_ctype)) + lte->wim->compression_type == ctx->out_ctype)) { /* Stream is too small or isn't being compressed. Process it by * the main thread when we have a chance. We can't necessarily @@ -1192,7 +1224,7 @@ main_thread_process_next_stream(struct wim_lookup_table_entry *lte, void *_ctx) } static long -get_default_num_threads() +get_default_num_threads(void) { #ifdef __WIN32__ return win32_get_number_of_processors(); @@ -1230,7 +1262,7 @@ get_default_num_threads() static int write_stream_list_parallel(struct list_head *stream_list, struct wim_lookup_table *lookup_table, - FILE *out_fp, + int out_fd, int out_ctype, int write_resource_flags, wimlib_progress_func_t progress_func, @@ -1303,12 +1335,12 @@ write_stream_list_parallel(struct list_head *stream_list, struct main_writer_thread_ctx ctx; ctx.stream_list = stream_list; ctx.lookup_table = lookup_table; - ctx.out_fp = out_fp; + ctx.out_fd = out_fd; ctx.out_ctype = out_ctype; ctx.res_to_compress_queue = &res_to_compress_queue; ctx.compressed_res_queue = &compressed_res_queue; ctx.num_messages = queue_size; - ctx.write_resource_flags = write_resource_flags | WIMLIB_RESOURCE_FLAG_THREADSAFE_READ; + ctx.write_resource_flags = write_resource_flags; ctx.progress_func = progress_func; ctx.progress = progress; ret = main_writer_thread_init_ctx(&ctx); @@ -1352,7 +1384,7 @@ out_serial: out_serial_quiet: return write_stream_list_serial(stream_list, lookup_table, - out_fp, + out_fd, out_ctype, write_resource_flags, progress_func, @@ -1362,13 +1394,13 @@ out_serial_quiet: #endif /* - * Write a list of streams to a WIM (@out_fp) using the compression type + * Write a list of streams to a WIM (@out_fd) using the compression type * @out_ctype and up to @num_threads compressor threads. */ static int write_stream_list(struct list_head *stream_list, struct wim_lookup_table *lookup_table, - FILE *out_fp, int out_ctype, int write_flags, + int out_fd, int out_ctype, int write_flags, unsigned num_threads, wimlib_progress_func_t progress_func) { struct wim_lookup_table_entry *lte; @@ -1407,10 +1439,10 @@ write_stream_list(struct list_head *stream_list, progress.write_streams._private = 0; #ifdef ENABLE_MULTITHREADED_COMPRESSION - if (total_compression_bytes >= 1000000 && num_threads != 1) + if (total_compression_bytes >= 2000000 && num_threads != 1) ret = write_stream_list_parallel(stream_list, lookup_table, - out_fp, + out_fd, out_ctype, write_resource_flags, progress_func, @@ -1420,7 +1452,7 @@ write_stream_list(struct list_head *stream_list, #endif ret = write_stream_list_serial(stream_list, lookup_table, - out_fp, + out_fd, out_ctype, write_resource_flags, progress_func, @@ -1515,10 +1547,10 @@ lte_overwrite_prepare_2(struct wim_lookup_table_entry *lte, void *_args) if (lte->resource_entry.offset + lte->resource_entry.size > args->end_offset) { - #ifdef ENABLE_ERROR_MESSAGES - ERROR("The following resource is after the XML data:"); - print_lookup_table_entry(lte, stderr); - #endif + if (wimlib_print_errors) { + ERROR("The following resource is after the XML data:"); + print_lookup_table_entry(lte, stderr); + } return WIMLIB_ERR_RESOURCE_ORDER; } copy_resource_entry(<e->output_resource_entry, @@ -1665,7 +1697,7 @@ prepare_stream_list(WIMStruct *wim, int image, struct list_head *stream_list) return ret; } -/* Writes the streams for the specified @image in @wim to @wim->out_fp. +/* Writes the streams for the specified @image in @wim to @wim->out_fd. */ static int write_wim_streams(WIMStruct *wim, int image, int write_flags, @@ -1680,8 +1712,8 @@ write_wim_streams(WIMStruct *wim, int image, int write_flags, return ret; return write_stream_list(&stream_list, wim->lookup_table, - wim->out_fp, - wimlib_get_compression_type(wim), + wim->out_fd, + wim->compression_type, write_flags, num_threads, progress_func); @@ -1696,9 +1728,6 @@ write_wim_streams(WIMStruct *wim, int image, int write_flags, * (public) WIMLIB_WRITE_FLAG_CHECK_INTEGRITY: * Include an integrity table. * - * (public) WIMLIB_WRITE_FLAG_SHOW_PROGRESS: - * Show progress information when (if) writing the integrity table. - * * (private) WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE: * Don't write the lookup table. * @@ -1722,7 +1751,6 @@ finish_write(WIMStruct *w, int image, int write_flags, { int ret; struct wim_header hdr; - FILE *out = w->out_fp; /* @hdr will be the header for the new WIM. First copy all the data * from the header in the WIMStruct; then set all the fields that may @@ -1758,7 +1786,7 @@ finish_write(WIMStruct *w, int image, int write_flags, goto out_close_wim; } - ret = write_xml_data(w->wim_info, image, out, + ret = write_xml_data(w->wim_info, image, w->out_fd, (write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE) ? wim_info_get_total_bytes(w->wim_info) : 0, &hdr.xml_res_entry); @@ -1770,28 +1798,10 @@ finish_write(WIMStruct *w, int image, int write_flags, struct wim_header checkpoint_hdr; memcpy(&checkpoint_hdr, &hdr, sizeof(struct wim_header)); zero_resource_entry(&checkpoint_hdr.integrity); - if (fseeko(out, 0, SEEK_SET)) { - ERROR_WITH_ERRNO("Failed to seek to beginning " - "of WIM being written"); - ret = WIMLIB_ERR_WRITE; - goto out_close_wim; - } - ret = write_header(&checkpoint_hdr, out); + checkpoint_hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS; + ret = write_header(&checkpoint_hdr, w->out_fd); if (ret) goto out_close_wim; - - if (fflush(out) != 0) { - ERROR_WITH_ERRNO("Can't write data to WIM"); - ret = WIMLIB_ERR_WRITE; - goto out_close_wim; - } - - if (fseeko(out, 0, SEEK_END) != 0) { - ERROR_WITH_ERRNO("Failed to seek to end " - "of WIM being written"); - ret = WIMLIB_ERR_WRITE; - goto out_close_wim; - } } off_t old_lookup_table_end; @@ -1805,7 +1815,7 @@ finish_write(WIMStruct *w, int image, int write_flags, new_lookup_table_end = hdr.lookup_table_res_entry.offset + hdr.lookup_table_res_entry.size; - ret = write_integrity_table(out, + ret = write_integrity_table(w->out_fd, &hdr.integrity, new_lookup_table_end, old_lookup_table_end, @@ -1816,42 +1826,34 @@ finish_write(WIMStruct *w, int image, int write_flags, zero_resource_entry(&hdr.integrity); } - if (fseeko(out, 0, SEEK_SET) != 0) { - ERROR_WITH_ERRNO("Failed to seek to beginning of WIM " - "being written"); - ret = WIMLIB_ERR_WRITE; - goto out_close_wim; - } - - ret = write_header(&hdr, out); + hdr.flags &= ~WIM_HDR_FLAG_WRITE_IN_PROGRESS; + ret = write_header(&hdr, w->out_fd); if (ret) goto out_close_wim; if (write_flags & WIMLIB_WRITE_FLAG_FSYNC) { - if (fflush(out) != 0 - || fsync(fileno(out)) != 0) - { - ERROR_WITH_ERRNO("Error flushing data to WIM file"); + if (fsync(w->out_fd)) { + ERROR_WITH_ERRNO("Error syncing data to WIM file"); ret = WIMLIB_ERR_WRITE; } } out_close_wim: - if (fclose(out) != 0) { + if (close(w->out_fd)) { ERROR_WITH_ERRNO("Failed to close the output WIM file"); if (ret == 0) ret = WIMLIB_ERR_WRITE; } - w->out_fp = NULL; + w->out_fd = -1; return ret; } #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK) int -lock_wim(WIMStruct *w, FILE *fp) +lock_wim(WIMStruct *w, int fd) { int ret = 0; - if (fp && !w->wim_locked) { - ret = flock(fileno(fp), LOCK_EX | LOCK_NB); + if (fd != -1 && !w->wim_locked) { + ret = flock(fd, LOCK_EX | LOCK_NB); if (ret != 0) { if (errno == EWOULDBLOCK) { ERROR("`%"TS"' is already being modified or has been " @@ -1872,37 +1874,24 @@ lock_wim(WIMStruct *w, FILE *fp) #endif static int -open_wim_writable(WIMStruct *w, const tchar *path, - bool trunc, bool also_readable) +open_wim_writable(WIMStruct *w, const tchar *path, int open_flags) { - const tchar *mode; - if (trunc) - if (also_readable) - mode = T("w+b"); - else - mode = T("wb"); - else - mode = T("r+b"); - - wimlib_assert(w->out_fp == NULL); - w->out_fp = tfopen(path, mode); - if (w->out_fp) { - return 0; - } else { + w->out_fd = topen(path, open_flags | O_BINARY, 0644); + if (w->out_fd == -1) { ERROR_WITH_ERRNO("Failed to open `%"TS"' for writing", path); return WIMLIB_ERR_OPEN; } + return 0; } void close_wim_writable(WIMStruct *w) { - if (w->out_fp) { - if (fclose(w->out_fp) != 0) { + if (w->out_fd != -1) { + if (close(w->out_fd)) WARNING_WITH_ERRNO("Failed to close output WIM"); - } - w->out_fp = NULL; + w->out_fd = -1; } } @@ -1911,12 +1900,25 @@ int begin_write(WIMStruct *w, const tchar *path, int write_flags) { int ret; - ret = open_wim_writable(w, path, true, - (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) != 0); + int open_flags = O_TRUNC | O_CREAT; + if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) + open_flags |= O_RDWR; + else + open_flags |= O_WRONLY; + ret = open_wim_writable(w, path, open_flags); if (ret) return ret; /* Write dummy header. It will be overwritten later. */ - return write_header(&w->hdr, w->out_fp); + w->hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS; + ret = write_header(&w->hdr, w->out_fd); + w->hdr.flags &= ~WIM_HDR_FLAG_WRITE_IN_PROGRESS; + if (ret) + return ret; + if (lseek(w->out_fd, WIM_HEADER_DISK_SIZE, SEEK_SET) == -1) { + ERROR_WITH_ERRNO("Failed to seek to end of WIM header"); + return WIMLIB_ERR_WRITE; + } + return 0; } /* Writes a stand-alone WIM to a file. */ @@ -2045,6 +2047,7 @@ overwrite_wim_inplace(WIMStruct *w, int write_flags, struct list_head stream_list; off_t old_wim_end; u64 old_lookup_table_end, old_xml_begin, old_xml_end; + int open_flags; DEBUG("Overwriting `%"TS"' in-place", w->filename); @@ -2095,30 +2098,43 @@ overwrite_wim_inplace(WIMStruct *w, int write_flags, if (ret) return ret; - ret = open_wim_writable(w, w->filename, false, - (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) != 0); + open_flags = 0; + if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) + open_flags |= O_RDWR; + else + open_flags |= O_WRONLY; + ret = open_wim_writable(w, w->filename, open_flags); if (ret) return ret; - ret = lock_wim(w, w->out_fp); + ret = lock_wim(w, w->out_fd); if (ret) { close_wim_writable(w); return ret; } - if (fseeko(w->out_fp, old_wim_end, SEEK_SET) != 0) { + /* Set WIM_HDR_FLAG_WRITE_IN_PROGRESS flag in header. */ + ret = write_header_flags(w->hdr.flags | WIM_HDR_FLAG_WRITE_IN_PROGRESS, + w->out_fd); + if (ret) { + ERROR_WITH_ERRNO("Error updating WIM header flags"); + close_wim_writable(w); + goto out_unlock_wim; + } + + if (lseek(w->out_fd, old_wim_end, SEEK_SET) == -1) { ERROR_WITH_ERRNO("Can't seek to end of WIM"); close_wim_writable(w); - w->wim_locked = 0; - return WIMLIB_ERR_WRITE; + ret = WIMLIB_ERR_WRITE; + goto out_unlock_wim; } DEBUG("Writing newly added streams (offset = %"PRIu64")", old_wim_end); ret = write_stream_list(&stream_list, w->lookup_table, - w->out_fp, - wimlib_get_compression_type(w), + w->out_fd, + w->compression_type, write_flags, num_threads, progress_func); @@ -2145,6 +2161,7 @@ out_truncate: * an error path. */ (void)ttruncate(w->filename, old_wim_end); } +out_unlock_wim: w->wim_locked = 0; return ret; } @@ -2175,19 +2192,9 @@ overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, goto out_unlink; } - DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, w->filename); - -#ifdef __WIN32__ - /* Windows won't let you delete open files unless FILE_SHARE_DELETE was - * specified to CreateFile(). The WIM was opened with fopen(), which - * didn't provided this flag to CreateFile, so the handle must be closed - * before executing the rename(). */ - if (w->fp != NULL) { - fclose(w->fp); - w->fp = NULL; - } -#endif + close_wim(w); + DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, w->filename); /* Rename the new file to the old file .*/ if (trename(tmpfile, w->filename) != 0) { ERROR_WITH_ERRNO("Failed to rename `%"TS"' to `%"TS"'", @@ -2202,22 +2209,6 @@ overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, progress.rename.to = w->filename; progress_func(WIMLIB_PROGRESS_MSG_RENAME, &progress); } - - /* Close the original WIM file that was opened for reading. */ - if (w->fp != NULL) { - fclose(w->fp); - w->fp = NULL; - } - - /* Re-open the WIM read-only. */ - w->fp = tfopen(w->filename, T("rb")); - if (w->fp == NULL) { - ret = WIMLIB_ERR_REOPEN; - WARNING_WITH_ERRNO("Failed to re-open `%"TS"' read-only", - w->filename); - FREE(w->filename); - w->filename = NULL; - } goto out; out_unlink: /* Remove temporary file. */ @@ -2235,15 +2226,16 @@ wimlib_overwrite(WIMStruct *w, int write_flags, unsigned num_threads, wimlib_progress_func_t progress_func) { + int ret; + write_flags &= WIMLIB_WRITE_MASK_PUBLIC; if (!w->filename) return WIMLIB_ERR_NO_FILENAME; - if (w->hdr.total_parts != 1) { - ERROR("Cannot modify a split WIM"); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; - } + ret = can_modify_wim(w); + if (ret) + return ret; if ((!w->deletion_occurred || (write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE)) && !(write_flags & WIMLIB_WRITE_FLAG_REBUILD))