Author: adrian.chadd
Date: Tue Apr 21 01:55:28 2009
New Revision: 13961
Modified:
branches/LUSCA_HEAD/Makefile.am
branches/LUSCA_HEAD/configure.in
branches/LUSCA_HEAD/src/Makefile.am
branches/LUSCA_HEAD/src/enums.h
branches/LUSCA_HEAD/src/globals.h
branches/LUSCA_HEAD/src/squid.h
branches/LUSCA_HEAD/src/structs.h
Log:
Link libsqstore into the build; break out some of the basic store
typedefs/enums.
Modified: branches/LUSCA_HEAD/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/Makefile.am (original)
+++ branches/LUSCA_HEAD/Makefile.am Tue Apr 21 01:55:28 2009
@@ -4,8 +4,8 @@
#
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
-DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem
libasyncio libsqtlv snmplib scripts src icons errors contrib doc helpers
tools app
-SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat
libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem
libasyncio libsqtlv @makesnmplib@ scripts src icons errors doc helpers
tools app
+DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem
libasyncio libsqtlv libsqstore snmplib scripts src icons errors contrib doc
helpers tools app
+SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat
libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem
libasyncio libsqtlv libsqstore @makesnmplib@ scripts src icons errors doc
helpers tools app
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
DEFAULT_PINGER = $(libexecdir)/`echo pinger |
sed '$(transform);s/$$/$(EXEEXT)/'`
Modified: branches/LUSCA_HEAD/configure.in
==============================================================================
--- branches/LUSCA_HEAD/configure.in (original)
+++ branches/LUSCA_HEAD/configure.in Tue Apr 21 01:55:28 2009
@@ -3321,6 +3321,7 @@
Makefile \
app/Makefile \
app/tcptest/Makefile \
+ libsqstore/Makefile \
libsqtlv/Makefile \
libmime/Makefile \
libasyncio/Makefile \
Modified: branches/LUSCA_HEAD/src/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/src/Makefile.am (original)
+++ branches/LUSCA_HEAD/src/Makefile.am Tue Apr 21 01:55:28 2009
@@ -255,6 +255,7 @@
-L../libsqname \
-L../libasyncio \
-L../libsqtlv \
+ -L../libsqstore \
@XTRA_OBJS@ \
@REPL_OBJS@ \
@STORE_OBJS@ \
@@ -265,6 +266,7 @@
@LIB_MALLOC@ \
@SSLLIB@ \
@LIB_EPOLL@ \
+ -lsqstore \
-lsqtlv \
-lasyncio \
-lstmem \
@@ -318,7 +320,7 @@
data_DATA = \
mib.txt
-LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libcb -L../libhelper -L../libmime -L../libstmem -L../libiapp
-L../libhttp -L../libstat -L../libsqdns -L../libsqident -L../libsqinet
-L../libasyncio -L../libsqtlv -lsqtlv -lasyncio -lsqinet -lsqdns -lsqdebug
-lcore -lmem -lsqname -lcb -lsqident -lhelper -lmime -lstmem -liapp -lhttp
-lstat -lmiscutil @XTRA_LIBS@
+LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libcb -L../libhelper -L../libmime -L../libstmem -L../libiapp
-L../libhttp -L../libstat -L../libsqdns -L../libsqident -L../libsqinet
-L../libasyncio -L../libsqtlv -L../libsqstore -lsqstore -lsqtlv -lasyncio
-lsqinet -lsqdns -lsqdebug -lcore -lmem -lsqname -lcb -lsqident -lhelper
-lmime -lstmem -liapp -lhttp -lstat -lmiscutil @XTRA_LIBS@
EXTRA_DIST = \
cf_gen_defines \
Modified: branches/LUSCA_HEAD/src/enums.h
==============================================================================
--- branches/LUSCA_HEAD/src/enums.h (original)
+++ branches/LUSCA_HEAD/src/enums.h Tue Apr 21 01:55:28 2009
@@ -402,14 +402,6 @@
STORE_LOG_SWAPOUTFAIL
};
-typedef enum {
- SWAP_LOG_NOP,
- SWAP_LOG_ADD,
- SWAP_LOG_DEL,
- SWAP_LOG_VERSION,
- SWAP_LOG_MAX
-} swap_log_op;
-
enum {
MEDIAN_HTTP,
MEDIAN_ICP_QUERY,
Modified: branches/LUSCA_HEAD/src/globals.h
==============================================================================
--- branches/LUSCA_HEAD/src/globals.h (original)
+++ branches/LUSCA_HEAD/src/globals.h Tue Apr 21 01:55:28 2009
@@ -95,7 +95,6 @@
extern StatCounters statCounter;
extern const char *err_type_str[];
extern const char *icp_opcode_str[];
-extern const char *swap_log_op_str[];
extern const char *lookup_t_str[];
extern double request_failure_ratio; /* 0.0 */
extern int store_hash_buckets; /* 0 */
Modified: branches/LUSCA_HEAD/src/squid.h
==============================================================================
--- branches/LUSCA_HEAD/src/squid.h (original)
+++ branches/LUSCA_HEAD/src/squid.h Tue Apr 21 01:55:28 2009
@@ -444,6 +444,7 @@
#include "../libsqstore/store_key.h"
#include "../libsqstore/store_mgr.h"
+#include "../libsqstore/store_log.h"
#include "defines.h"
#include "enums.h"
Modified: branches/LUSCA_HEAD/src/structs.h
==============================================================================
--- branches/LUSCA_HEAD/src/structs.h (original)
+++ branches/LUSCA_HEAD/src/structs.h Tue Apr 21 01:55:28 2009
@@ -1897,46 +1897,6 @@
} swap;
};
-/*
- * Do we need to have the dirn in here? I don't think so, since we already
- * know the dirn ..
- */
-struct _storeSwapLogData {
- char op;
- sfileno swap_filen;
- time_t timestamp;
- time_t lastref;
- time_t expires;
- time_t lastmod;
- squid_file_sz swap_file_sz;
- u_short refcount;
- u_short flags;
- unsigned char key[SQUID_MD5_DIGEST_LENGTH];
-};
-
-struct _storeSwapLogHeader {
- char op;
- int version;
- int record_size;
-};
-
-#if SIZEOF_SQUID_FILE_SZ != SIZEOF_SIZE_T
-struct _storeSwapLogDataOld {
- char op;
- sfileno swap_filen;
- time_t timestamp;
- time_t lastref;
- time_t expires;
- time_t lastmod;
- size_t swap_file_sz;
- u_short refcount;
- u_short flags;
- unsigned char key[SQUID_MD5_DIGEST_LENGTH];
-};
-
-#endif
-
-
struct _ClientInfo {
hash_link hash; /* must be first */
struct in_addr addr;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
