Author: adrian.chadd
Date: Tue Jul 7 23:28:31 2009
New Revision: 14144
Modified:
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/Makefile.am
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_dir.c
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_build_log.c
playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_rebuild.c
Log:
Begin working on making the rebuild program work
Modified: playpen/LUSCA_HEAD_storework/app/ufs_rebuild/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_storework/app/ufs_rebuild/Makefile.am (original)
+++ playpen/LUSCA_HEAD_storework/app/ufs_rebuild/Makefile.am Tue Jul 7
23:28:31 2009
@@ -20,7 +20,7 @@
ufs_rebuild_SOURCES = ufs_rebuild.c ufs_build_log.c ufs_build_dir.c
-LDADD = -L../../lib -L../../libsqdebug -L../../libcore -L../../libmem
-L../../libsqstore -lcb -lsqdebug -lcore -lm -lsqstore -lmiscutil
+LDADD = -L../../lib -L../../libsqdebug -L../../libcore -L../../libmem
-L../../libsqstore -L../../libsqtlv -lsqtlv -lsqdebug -lcore -lm -lsqstore
-lmiscutil
$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
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 Tue Jul
7
23:28:31 2009
@@ -55,9 +55,6 @@
#define BUFSIZE 1024
-/* normally in libiapp .. */
-int shutting_down = 0;
-
struct _rebuild_entry {
storeMetaIndexNew mi;
char *md5_key;
@@ -242,6 +239,7 @@
}
}
+#if 0
int
main(int argc, char *argv[])
{
@@ -265,3 +263,4 @@
return 0;
}
+#endif
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 Tue Jul
7
23:28:31 2009
@@ -40,9 +40,6 @@
#include "../libsqstore/store_mgr.h"
#include "../libsqstore/store_log.h"
-/* normally in libiapp .. */
-int shutting_down = 0;
-
int num_objects = 0;
int num_valid_objects = 0;
int num_invalid_objects = 0;
@@ -88,7 +85,7 @@
}
void
-read_file(const char *swapfile)
+read_log_file(const char *swapfile)
{
FILE *fp;
storeSwapLogHeader hdr;
@@ -152,6 +149,7 @@
fclose(fp);
}
+#if 0
int
main(int argc, char *argv[])
{
@@ -164,9 +162,10 @@
exit(1);
}
- read_file(argv[2]);
+ read_log_file(argv[2]);
debug(1, 1) ("%s: Read %d objects\n", argv[2], num_objects);
return 0;
}
+#endif
Modified: playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_rebuild.c
==============================================================================
--- playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_rebuild.c (original)
+++ playpen/LUSCA_HEAD_storework/app/ufs_rebuild/ufs_rebuild.c Tue Jul 7
23:28:31 2009
@@ -2,9 +2,30 @@
#include <stdlib.h>
#include <unistd.h>
+#include "libcore/varargs.h"
+#include "libsqdebug/debug.h"
+#include "libsqstore/store_file_ufs.h"
int
main(int argc, char *argv[])
{
- exit(0);
+ /* Setup the debugging library */
+ _db_init("ALL,1");
+ _db_set_stderr_debug(1);
+ store_ufs_dir_t store_ufs_info;
+
+ if (argc < 5) {
+ printf("Usage: %s <store path> <l1> <l2> <path to swapfile>\n",
argv[0]);
+ exit(1);
+ }
+
+ store_ufs_init(&store_ufs_info, argv[1], atoi(argv[2]), atoi(argv[3]),
argv[4]);
+
+ /* Output swap header to stdout */
+ (void) storeSwapLogPrintHeader(1);
+
+ read_dir(&store_ufs_info);
+ store_ufs_done(&store_ufs_info);
+
+ return 0;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
