Author: adrian.chadd
Date: Fri Jul 10 05:20:19 2009
New Revision: 14180
Modified:
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_dir.c
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_log.c
Log:
Correctly print out progress data!
Modified: playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_dir.c
==============================================================================
--- playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_dir.c
(original)
+++ playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_dir.c Fri Jul
10
05:20:19 2009
@@ -142,9 +142,8 @@
for (i = 0; i < store_ufs_l1(sd); i++) {
for (j = 0; j < store_ufs_l2(sd); j++) {
(void) store_ufs_createDir(sd, i, j, dir);
- if (! write_swaplog_progress_entry(sd, i, j))
+ if (! storeSwapLogPrintProgress(1, (sd->l2 * i) + j,
(sd->l1 * sd->l2)))
return;
-
getCurrentTime();
debug(47, 2) ("read_dir: opening dir %s\n", dir);
Modified: playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_log.c
==============================================================================
--- playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_log.c
(original)
+++ playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_log.c Fri Jul
10
05:20:19 2009
@@ -23,6 +23,7 @@
#endif
#include <errno.h>
+#include <sys/stat.h>
#include "include/util.h"
#include "include/squid_md5.h"
@@ -64,6 +65,14 @@
return 0;
}
num_objects++;
+
+ if (num_objects & 0xffff) {
+ struct stat sb;
+ if (0 == fstat(fileno(fp), &sb)) {
+ if (! storeSwapLogPrintProgress(1, num_objects, (int)
sb.st_size / s))
+ return 0;
+ }
+ }
/* Decode the entry */
if (version == 1) {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
