/*
* Copyright (C) 2012, 2013, 2014 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#include "wimlib/progress.h"
#include "wimlib/security.h"
-static int
-lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
-{
- if (lte->refcnt != lte->real_refcnt) {
- lte->refcnt = lte->real_refcnt;
- ++*(unsigned long *)ctr;
- }
- return 0;
-}
-
-static void
-tally_inode_refcnts(const struct wim_inode *inode,
- const struct wim_lookup_table *lookup_table)
-{
- for (unsigned i = 0; i <= inode->i_num_ads; i++) {
- struct wim_lookup_table_entry *lte;
- lte = inode_stream_lte(inode, i, lookup_table);
- if (lte)
- lte->real_refcnt += inode->i_nlink;
- }
-}
-
-
-static int
-tally_image_refcnts(WIMStruct *wim)
-{
- const struct wim_image_metadata *imd;
- const struct wim_inode *inode;
-
- imd = wim_get_current_image_metadata(wim);
- image_for_each_inode(inode, imd)
- tally_inode_refcnts(inode, wim->lookup_table);
- return 0;
-}
-
-
-/* Ideally this would be unnecessary... however, the WIMs for Windows 8 are
- * screwed up because some lookup table entries are referenced more times than
- * their stated reference counts. So theoretically, if we delete all the
- * references to a stream and then remove it, it might still be referenced
- * somewhere else, making a file be missing from the WIM... So, work around this
- * problem by looking at ALL the images to re-calculate the reference count of
- * EVERY lookup table entry. This only absolutely has to be done before an image
- * is deleted or before an image is mounted read-write. */
-int
-wim_recalculate_refcnts(WIMStruct *wim)
-{
- unsigned long num_ltes_with_bogus_refcnt = 0;
- int ret;
-
- for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL);
- ret = for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts);
- if (ret)
- return ret;
- num_ltes_with_bogus_refcnt = 0;
- for_lookup_table_entry(wim->lookup_table, lte_fix_refcnt,
- &num_ltes_with_bogus_refcnt);
- if (num_ltes_with_bogus_refcnt != 0) {
- WARNING("%lu stream(s) had incorrect reference count.",
- num_ltes_with_bogus_refcnt);
- }
- wim->refcnts_ok = 1;
- return 0;
-}
-
static int
append_lte_to_list(struct wim_lookup_table_entry *lte, void *_list)
{
wimlib_progress_func_t progfunc;
void *progctx;
union wimlib_progress_info *progress;
+ u64 next_progress;
};
static int
end_verify_stream(struct wim_lookup_table_entry *lte, int status, void *_ctx)
{
struct verify_stream_list_ctx *ctx = _ctx;
+ union wimlib_progress_info *progress = ctx->progress;
if (status)
return status;
- ctx->progress->verify_streams.completed_streams++;
- ctx->progress->verify_streams.completed_bytes += lte->size;
+ progress->verify_streams.completed_streams++;
+ progress->verify_streams.completed_bytes += lte->size;
+
+ /* Handle rate-limiting of progress messages */
+
+ if (progress->verify_streams.completed_bytes < ctx->next_progress)
+ return 0;
- return call_progress(ctx->progfunc, WIMLIB_PROGRESS_MSG_VERIFY_STREAMS,
- ctx->progress, ctx->progctx);
+ /* Time for another progress message. */
+
+ status = call_progress(ctx->progfunc, WIMLIB_PROGRESS_MSG_VERIFY_STREAMS,
+ progress, ctx->progctx);
+ if (status)
+ return status;
+
+ if (ctx->next_progress == progress->verify_streams.total_bytes) {
+ ctx->next_progress = ~(uint64_t)0;
+ return 0;
+ }
+
+ /* Send new message as soon as another 1/128 of the total has
+ * been verified. (Arbitrary number.) */
+ ctx->next_progress = progress->verify_streams.completed_bytes +
+ progress->verify_streams.total_bytes / 128;
+
+ /* ... Unless that would be more than 5000000 bytes, in which case send
+ * the next after the next 5000000 bytes. (Another arbitrary number.) */
+ if (progress->verify_streams.completed_bytes + 5000000 < ctx->next_progress)
+ ctx->next_progress = progress->verify_streams.completed_bytes + 5000000;
+
+ /* ... But always send a message as soon as we're completely
+ * done. */
+ if (progress->verify_streams.total_bytes < ctx->next_progress)
+ ctx->next_progress = progress->verify_streams.total_bytes;
+ return 0;
}
static int
ctx.progfunc = wim->progfunc;
ctx.progctx = wim->progctx;
ctx.progress = &progress;
+ ctx.next_progress = 0;
ret = call_progress(ctx.progfunc, WIMLIB_PROGRESS_MSG_VERIFY_STREAMS,
ctx.progress, ctx.progctx);
git://wimlib.net / wimlib / blobdiff