/*
* Writes a WIM file to the original file that it was read from, overwriting it.
*/
-WIMLIBAPI int wimlib_overwrite(WIMStruct *w, int write_flags)
+WIMLIBAPI int wimlib_overwrite(WIMStruct *w, int write_flags,
+ unsigned num_threads)
{
const char *wimfile_name;
size_t wim_name_len;
randomize_char_array_with_alnum(tmpfile + wim_name_len, 9);
tmpfile[wim_name_len + 9] = '\0';
- ret = wimlib_write(w, tmpfile, WIM_ALL_IMAGES, write_flags);
+ ret = wimlib_write(w, tmpfile, WIM_ALL_IMAGES, write_flags,
+ num_threads);
if (ret != 0) {
ERROR("Failed to write the WIM file `%s'", tmpfile);
if (unlink(tmpfile) != 0)
DEBUG("Compressor thread terminating");
}
+static void show_stream_write_progress(u64 *cur_size, u64 *next_size,
+ u64 total_size, u64 one_percent,
+ unsigned *cur_percent,
+ const struct lookup_table_entry *cur_lte)
+{
+ if (*cur_size >= *next_size) {
+ printf("\r%"PRIu64" MiB of %"PRIu64" MiB "
+ "(uncompressed) written (%u%% done)",
+ *cur_size >> 20,
+ total_size >> 20, *cur_percent);
+ fflush(stdout);
+ *next_size += one_percent;
+ (*cur_percent)++;
+ }
+ *cur_size += wim_resource_size(cur_lte);
+}
+
+static void finish_stream_write_progress(u64 total_size)
+{
+ printf("\r%"PRIu64" MiB of %"PRIu64" MiB "
+ "(uncompressed) written (100%% done)\n",
+ total_size >> 20, total_size >> 20);
+ fflush(stdout);
+}
+
static int write_stream_list_serial(struct list_head *stream_list,
FILE *out_fp, int out_ctype,
- int write_flags)
+ int write_flags, u64 total_size)
{
struct lookup_table_entry *lte;
int ret;
+ u64 one_percent = total_size / 100;
+ u64 cur_size = 0;
+ u64 next_size = 0;
+ unsigned cur_percent = 0;
+
list_for_each_entry(lte, stream_list, staging_list) {
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ show_stream_write_progress(&cur_size, &next_size,
+ total_size, one_percent,
+ &cur_percent, lte);
+ }
ret = write_wim_resource(lte, out_fp, out_ctype,
<e->output_resource_entry, 0);
if (ret != 0)
return ret;
}
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS)
+ finish_stream_write_progress(total_size);
return 0;
}
return 0;
}
+
/*
* This function is executed by the main thread when the resources are being
* compressed in parallel. The main thread is in change of all reading of the
int out_ctype,
struct shared_queue *res_to_compress_queue,
struct shared_queue *compressed_res_queue,
- size_t queue_size)
+ size_t queue_size,
+ int write_flags,
+ u64 total_size)
{
int ret;
struct lookup_table_entry *lte;
struct message *msg;
+ u64 one_percent = total_size / 100;
+ u64 cur_size = 0;
+ u64 next_size = 0;
+ unsigned cur_percent = 0;
+
#ifdef WITH_NTFS_3G
ntfs_inode *ni = NULL;
#endif
DEBUG2("Complete msg (begin_chunk=%"PRIu64")", msg->begin_chunk);
if (msg->begin_chunk == 0) {
DEBUG2("Begin chunk tab");
+
+
+
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ show_stream_write_progress(&cur_size,
+ &next_size,
+ total_size,
+ one_percent,
+ &cur_percent,
+ cur_lte);
+ }
+
// This is the first set of chunks. Leave space
// for the chunk table in the output file.
off_t cur_offset = ftello(out_fp);
&my_resources,
staging_list)
{
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ show_stream_write_progress(&cur_size,
+ &next_size,
+ total_size,
+ one_percent,
+ &cur_percent,
+ lte);
+ }
+
ret = write_wim_resource(lte,
out_fp,
out_ctype,
0);
if (ret != 0)
break;
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ show_stream_write_progress(&cur_size,
+ &next_size,
+ total_size,
+ one_percent,
+ &cur_percent,
+ lte);
+ }
}
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS)
+ finish_stream_write_progress(total_size);
} else {
size_t num_available_msgs = 0;
struct list_head *cur;
static int write_stream_list_parallel(struct list_head *stream_list,
FILE *out_fp, int out_ctype,
- int write_flags)
+ int write_flags, u64 total_size,
+ unsigned num_threads)
{
int ret;
- long nthreads;
struct shared_queue res_to_compress_queue;
struct shared_queue compressed_res_queue;
- nthreads = sysconf(_SC_NPROCESSORS_ONLN);
- if (nthreads < 1) {
- WARNING("Could not determine number of processors! Assuming 1");
- goto out_serial;
+ if (num_threads == 0) {
+ long nthreads = sysconf(_SC_NPROCESSORS_ONLN);
+ if (nthreads < 1) {
+ WARNING("Could not determine number of processors! Assuming 1");
+ goto out_serial;
+ } else {
+ num_threads = nthreads;
+ }
}
wimlib_assert(stream_list->next != stream_list);
{
- pthread_t compressor_threads[nthreads];
+ pthread_t compressor_threads[num_threads];
static const double MESSAGES_PER_THREAD = 2.0;
- size_t queue_size = (size_t)(nthreads * MESSAGES_PER_THREAD);
+ size_t queue_size = (size_t)(num_threads * MESSAGES_PER_THREAD);
DEBUG("Initializing shared queues (queue_size=%zu)", queue_size);
params.compressed_res_queue = &compressed_res_queue;
params.compress = get_compress_func(out_ctype);
- for (long i = 0; i < nthreads; i++) {
- DEBUG("pthread_create thread %ld", i);
+ for (unsigned i = 0; i < num_threads; i++) {
+ DEBUG("pthread_create thread %u", i);
ret = pthread_create(&compressor_threads[i], NULL,
compressor_thread_proc, ¶ms);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to create compressor "
- "thread %ld", i);
- nthreads = i;
+ "thread %u", i);
+ num_threads = i;
goto out_join;
}
}
- if (write_flags & WIMLIB_WRITE_FLAG_VERBOSE) {
- printf("Writing compressed data using %ld threads...\n",
- nthreads);
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ printf("Writing compressed data using %u threads...\n",
+ num_threads);
}
ret = main_writer_thread_proc(stream_list,
out_ctype,
&res_to_compress_queue,
&compressed_res_queue,
- queue_size);
+ queue_size,
+ write_flags,
+ total_size);
out_join:
- for (long i = 0; i < nthreads; i++)
+ for (unsigned i = 0; i < num_threads; i++)
shared_queue_put(&res_to_compress_queue, NULL);
- for (long i = 0; i < nthreads; i++) {
+ for (unsigned i = 0; i < num_threads; i++) {
if (pthread_join(compressor_threads[i], NULL)) {
- WARNING("Failed to join compressor thread %ld: %s",
+ WARNING("Failed to join compressor thread %u: %s",
i, strerror(errno));
}
}
out_serial:
WARNING("Falling back to single-threaded compression");
return write_stream_list_serial(stream_list, out_fp,
- out_ctype, write_flags);
+ out_ctype, write_flags, total_size);
}
static int write_stream_list(struct list_head *stream_list, FILE *out_fp,
- int out_ctype, int write_flags)
+ int out_ctype, int write_flags,
+ unsigned num_threads)
{
struct lookup_table_entry *lte;
size_t num_streams = 0;
wimlib_get_compression_type_string(out_ctype));
}
- if (compression_needed && total_size >= 1000000) {
+ if (compression_needed && total_size >= 1000000 && num_threads != 1) {
return write_stream_list_parallel(stream_list, out_fp,
- out_ctype, write_flags);
+ out_ctype, write_flags,
+ total_size, num_threads);
} else {
- if (write_flags & WIMLIB_WRITE_FLAG_VERBOSE) {
- puts("Using 1 thread (no compression needed)");
+ if (write_flags & WIMLIB_WRITE_FLAG_SHOW_PROGRESS) {
+ const char *reason = "";
+ if (num_threads != 1)
+ reason = " (no compression needed)";
+ printf("Writing data using 1 thread%s\n", reason);
}
return write_stream_list_serial(stream_list, out_fp,
- out_ctype, write_flags);
+ out_ctype, write_flags,
+ total_size);
}
}
dentry_find_streams_to_write, w);
}
-static int write_wim_streams(WIMStruct *w, int image, int write_flags)
+static int write_wim_streams(WIMStruct *w, int image, int write_flags,
+ unsigned num_threads)
{
LIST_HEAD(stream_list);
w->private = &stream_list;
for_image(w, image, find_streams_to_write);
return write_stream_list(&stream_list, w->out_fp,
- wimlib_get_compression_type(w), write_flags);
+ wimlib_get_compression_type(w), write_flags,
+ num_threads);
}
/*
/* Writes a stand-alone WIM to a file. */
WIMLIBAPI int wimlib_write(WIMStruct *w, const char *path,
- int image, int write_flags)
+ int image, int write_flags, unsigned num_threads)
{
int ret;
for_lookup_table_entry(w->lookup_table, lte_zero_out_refcnt, NULL);
- ret = write_wim_streams(w, image, write_flags);
+ ret = write_wim_streams(w, image, write_flags, num_threads);
if (ret != 0) {
/*ERROR("Failed to write WIM file resources to `%s'", path);*/