Author: adrian.chadd
Date: Tue Apr 21 01:04:41 2009
New Revision: 13957
Added:
branches/LUSCA_HEAD/libsqstore/
branches/LUSCA_HEAD/libsqstore/store_key.h
branches/LUSCA_HEAD/libsqstore/store_mgr.h
Modified:
branches/LUSCA_HEAD/src/squid.h
branches/LUSCA_HEAD/src/typedefs.h
Log:
Start migrating some of the storage related defines out of src/*.h .
This is the prelude to being able to do some store UFS object parsing and
log file manipulation outside of the squid source directory (and with
minimal hackery.)
Added: branches/LUSCA_HEAD/libsqstore/store_key.h
==============================================================================
--- (empty file)
+++ branches/LUSCA_HEAD/libsqstore/store_key.h Tue Apr 21 01:04:41 2009
@@ -0,0 +1,7 @@
+#ifndef __LIBSQSTORE_STORE_H__
+#define __LIBSQSTORE_STORE_H__
+
+/* the SQUID_MD5_DIGEST_LENGTH is defined in include/squid_md5.h .. */
+
+
+#endif
Added: branches/LUSCA_HEAD/libsqstore/store_mgr.h
==============================================================================
--- (empty file)
+++ branches/LUSCA_HEAD/libsqstore/store_mgr.h Tue Apr 21 01:04:41 2009
@@ -0,0 +1,20 @@
+#ifndef __LIBSQSTORE_STORE_MGR_H__
+#define __LIBSQSTORE_STORE_MGR_H__
+
+
+typedef unsigned int store_status_t;
+typedef unsigned int mem_status_t;
+typedef unsigned int ping_status_t;
+typedef unsigned int swap_status_t;
+typedef signed int sfileno;
+typedef signed int sdirno;
+
+#if LARGE_CACHE_FILES
+typedef squid_off_t squid_file_sz;
+#define SIZEOF_SQUID_FILE_SZ SIZEOF_SQUID_OFF_T
+#else
+typedef size_t squid_file_sz;
+#define SIZEOF_SQUID_FILE_SZ SIZEOF_SIZE_T
+#endif
+
+#endif
Modified: branches/LUSCA_HEAD/src/squid.h
==============================================================================
--- branches/LUSCA_HEAD/src/squid.h (original)
+++ branches/LUSCA_HEAD/src/squid.h Tue Apr 21 01:04:41 2009
@@ -440,6 +440,9 @@
#include "../libstmem/stmem.h"
+#include "../libsqstore/store_key.h"
+#include "../libsqstore/store_mgr.h"
+
#include "defines.h"
#include "enums.h"
#include "typedefs.h"
Modified: branches/LUSCA_HEAD/src/typedefs.h
==============================================================================
--- branches/LUSCA_HEAD/src/typedefs.h (original)
+++ branches/LUSCA_HEAD/src/typedefs.h Tue Apr 21 01:04:41 2009
@@ -34,21 +34,6 @@
#ifndef SQUID_TYPEDEFS_H
#define SQUID_TYPEDEFS_H
-typedef unsigned int store_status_t;
-typedef unsigned int mem_status_t;
-typedef unsigned int ping_status_t;
-typedef unsigned int swap_status_t;
-typedef signed int sfileno;
-typedef signed int sdirno;
-
-#if LARGE_CACHE_FILES
-typedef squid_off_t squid_file_sz;
-#define SIZEOF_SQUID_FILE_SZ SIZEOF_SQUID_OFF_T
-#else
-typedef size_t squid_file_sz;
-#define SIZEOF_SQUID_FILE_SZ SIZEOF_SIZE_T
-#endif
-
/*
* grep '^struct' structs.h \
* | perl -ne '($a,$b)=split;$c=$b;$c=~s/^_//; print "typedef struct $b
$c;\n";'
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
