Author: adrian.chadd
Date: Sun May 3 07:23:23 2009
New Revision: 14031
Added:
branches/LUSCA_HEAD/tools/ufs_log_cat.c
Modified:
branches/LUSCA_HEAD/tools/Makefile.am
Log:
Start fleshing out a simple command to cat a swaplog file and return the
"new" version. The "new" version is whatever storeSwapLogData is, rather
than storeSwapLogDataOld. It also includes adding the version header.
Modified: branches/LUSCA_HEAD/tools/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/tools/Makefile.am (original)
+++ branches/LUSCA_HEAD/tools/Makefile.am Sun May 3 07:23:23 2009
@@ -29,12 +29,14 @@
libexec_PROGRAMS = \
ufs_log_build \
+ ufs_log_cat \
cachemgr$(CGIEXT)
squidclient_SOURCES = squidclient.c
cossdump_SOURCES = cossdump.c
ufs_log_build_SOURCES = ufs_log_build.c
ufs_log_dump_SOURCES = ufs_log_dump.c
+ufs_log_cat_SOURCES = ufs_log_cat.c
cachemgr__CGIEXT__SOURCES = cachemgr.c
cachemgr__CGIEXT__CFLAGS =
-DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
Added: branches/LUSCA_HEAD/tools/ufs_log_cat.c
==============================================================================
--- (empty file)
+++ branches/LUSCA_HEAD/tools/ufs_log_cat.c Sun May 3 07:23:23 2009
@@ -0,0 +1,118 @@
+#include "config.h"
+
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#include <dirent.h>
+
+#include "../include/util.h"
+
+#include "../libcore/kb.h"
+#include "../libcore/varargs.h"
+#include "../libcore/mem.h"
+#include "../libcore/tools.h"
+
+#include "../libsqdebug/debug.h"
+
+#include "../libsqtlv/tlv.h"
+
+#define SQUID_MD5_DIGEST_LENGTH 16
+
+#include "../libsqstore/store_mgr.h"
+#include "../libsqstore/store_log.h"
+
+/* normally in libiapp .. */
+int shutting_down = 0;
+
+void
+read_file(const char *swapfile)
+{
+ FILE *fp;
+ storeSwapLogHeader hdr;
+ int r;
+ int version = -1; /* -1 = not set, 0 = old, 1 = new */
+
+ fp = fopen(swapfile, "r");
+ if (! fp) {
+ perror("fopen");
+ return;
+ }
+
+ /* Read an entry - see if its a swap header! */
+ r = fread(&hdr, sizeof(hdr), 1, fp);
+ if (r != 1) {
+ perror("fread");
+ fclose(fp);
+ return;
+ }
+
+ /*
+ * If hdr is a swap log version then we can determine whether
+ * if its old or new. If it isn't then we can't determine what
+ * type it is, so assume its the "default" size.
+ */
+ if (hdr.op == SWAP_LOG_VERSION) {
+ if (fseek(fp, hdr.record_size, SEEK_SET) != 0) {
+ perror("fseek");
+ fclose(fp);
+ return;
+ }
+ if (hdr.version == 1 && hdr.record_size ==
sizeof(storeSwapLogData)) {
+ version = 1;
+ } else if (hdr.version == 1 && hdr.record_size ==
sizeof(storeSwapLogDataOld)) {
+ version = 0;
+ } else {
+ debug(1, 1) ("Unsupported swap.state version %d size
%d\n",
hdr.version, hdr.record_size);
+ fclose(fp);
+ return;
+ }
+ } else {
+ /* Otherwise, default based on the compile time size comparison
*/
+ rewind(fp);
+#if SIZEOF_SQUID_FILE_SZ == SIZEOF_SIZE_T
+ version = 1;
+#else
+ version = 0;
+#endif
+ }
+
+ /* Now - loop over until eof or error */
+
+ fclose(fp);
+}
+
+int
+main(int argc, char *argv[])
+{
+ /* Setup the debugging library */
+ _db_init("ALL,1");
+ _db_set_stderr_debug(1);
+
+ if (argc < 3) {
+ printf("Usage: %s -f <path to swaplog>\n", argv[0]);
+ exit(1);
+ }
+
+ read_file(argv[2]);
+
+ 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
-~----------~----~----~----~------~----~------~--~---
