/*
- * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
#include "RemovalPolicy.h"
#include "SquidString.h"
#include "stmem.h"
+#include "store/forward.h"
#include "StoreIOBuffer.h"
#include "StoreIOState.h"
#include "typedefs.h" //for IRCB
#endif
typedef void STMCB (void *data, StoreIOBuffer wroteBuffer);
-typedef void STABH(void *);
class store_client;
+class PeerSelector;
class MemObject
{
MemObject();
~MemObject();
- /// sets store ID, log URI, and request method; TODO: find a better name
+ /// Sets store ID, log URI, and request method (unless already set). Does
+ /// not clobber the method so that, say, a HEAD hit for a GET entry keeps
+ /// the GET method that matches the entry key. Same for the other parts of
+ /// the trio because the entry filling code may expect them to be constant.
+ /// XXX: Avoid this method. We plan to remove it and make the trio constant
+ /// after addressing the XXX in MemStore::get().
void setUris(char const *aStoreId, char const *aLogUri, const HttpRequestMethod &aMethod);
/// whether setUris() has been called
void write(const StoreIOBuffer &buf);
void unlinkRequest() { request = nullptr; }
- const HttpReplyPointer &getReply() const { return reply_; }
- void replaceReply(const HttpReplyPointer &r) { reply_ = r; }
+
+ /// HTTP response before 304 (Not Modified) updates
+ /// starts "empty"; modified via replaceBaseReply() or adjustableBaseReply()
+ const HttpReply &baseReply() const { return *reply_; }
+
+ /// \returns nil -- if no 304 updates since replaceBaseReply()
+ /// \returns combination of baseReply() and 304 updates -- after updates
+ const HttpReplyPointer &updatedReply() const { return updatedReply_; }
+
+ /// \returns the updated-by-304(s) response (if it exists)
+ /// \returns baseReply() (otherwise)
+ const HttpReply &freshestReply() const {
+ if (updatedReply_)
+ return *updatedReply_;
+ else
+ return baseReply();
+ }
+
+ /// \returns writable base reply for parsing and other initial modifications
+ /// Base modifications can only be done when forming/loading the entry.
+ /// After that, use replaceBaseReply() to reset all of the replies.
+ HttpReply &adjustableBaseReply();
+
+ /// (re)sets base reply, usually just replacing the initial/empty object
+ /// also forgets the updated reply (if any)
+ void replaceBaseReply(const HttpReplyPointer &r);
+
+ /// (re)sets updated reply; \see updatedReply()
+ void updateReply(const HttpReply &r) { updatedReply_ = &r; }
+
+ /// reflects past Controller::updateOnNotModified(old, e304) calls:
+ /// for HTTP 304 entries: whether our entry was used as "e304"
+ /// for other entries: whether our entry was updated as "old"
+ bool appliedUpdates = false;
+
void stat (MemBuf * mb) const;
int64_t endOffset () const;
- void markEndOfReplyHeaders(); ///< sets reply_->hdr_sz to endOffset()
+
+ /// sets baseReply().hdr_sz (i.e. written reply headers size) to endOffset()
+ void markEndOfReplyHeaders();
+
/// negative if unknown; otherwise, expected object_sz, expected endOffset
/// maximum, and stored reply headers+body size (all three are the same)
int64_t expectedReplySize() const;
HttpRequestMethod method;
mem_hdr data_hdr;
- int64_t inmem_lo;
+ int64_t inmem_lo = 0;
dlink_list clients;
size_t clientCount() const {return nclients;}
bool clientIsFirst(void *sc) const {return (clients.head && sc == clients.head->data);}
- int nclients;
+ int nclients = 0;
class SwapOut
{
public:
- SwapOut() : queue_offset(0), decision(swNeedsCheck) {}
-
- int64_t queue_offset; ///< number of bytes sent to SwapDir for writing
+ int64_t queue_offset = 0; ///< number of bytes sent to SwapDir for writing
StoreIOState::Pointer sio;
/// Decision states for StoreEntry::swapoutPossible() and related code.
typedef enum { swNeedsCheck = 0, swImpossible = -1, swPossible = +1, swStarted } Decision;
- Decision decision; ///< current decision state
+ Decision decision = swNeedsCheck; ///< current decision state
};
SwapOut swapout;
- /// cache "I/O" direction and status
- typedef enum { ioUndecided, ioWriting, ioReading, ioDone } Io;
+ /* TODO: Remove this change-minimizing hack */
+ using Io = Store::IoStatus;
+ static constexpr Io ioUndecided = Store::ioUndecided;
+ static constexpr Io ioReading = Store::ioReading;
+ static constexpr Io ioWriting = Store::ioWriting;
+ static constexpr Io ioDone = Store::ioDone;
/// State of an entry with regards to the [shared] in-transit table.
class XitTable
{
public:
- XitTable(): index(-1), io(ioUndecided) {}
-
- int32_t index; ///< entry position inside the in-transit table
- Io io; ///< current I/O state
+ int32_t index = -1; ///< entry position inside the in-transit table
+ Io io = ioUndecided; ///< current I/O state
};
XitTable xitTable; ///< current [shared] memory caching state for the entry
class MemCache
{
public:
- MemCache(): index(-1), offset(0), io(ioUndecided) {}
+ int32_t index = -1; ///< entry position inside the memory cache
+ int64_t offset = 0; ///< bytes written/read to/from the memory cache so far
- int32_t index; ///< entry position inside the memory cache
- int64_t offset; ///< bytes written/read to/from the memory cache so far
-
- Io io; ///< current I/O state
+ Io io = ioUndecided; ///< current I/O state
};
MemCache memCache; ///< current [shared] memory caching state for the entry
- bool smpCollapsed; ///< whether this entry gets data from another worker
-
- /* Read only - this reply must be preserved by store clients */
- /* The original reply. possibly with updated metadata. */
HttpRequestPointer request;
struct timeval start_ping;
IRCB *ping_reply_callback;
- void *ircb_data;
+ PeerSelector *ircb_data = nullptr;
- struct {
- STABH *callback;
- void *data;
- } abort;
+ /// used for notifying StoreEntry writers about 3rd-party initiated aborts
+ AsyncCall::Pointer abortCallback;
RemovalPolicyNode repl;
- int id;
- int64_t object_sz;
- size_t swap_hdr_sz;
+ int id = 0;
+ int64_t object_sz = -1;
+ size_t swap_hdr_sz = 0;
#if URL_CHECKSUM_DEBUG
-
- unsigned int chksum;
+ unsigned int chksum = 0;
#endif
SBuf vary_headers;
void kickReads();
private:
- HttpReplyPointer reply_;
+ HttpReplyPointer reply_; ///< \see baseReply()
+ HttpReplyPointer updatedReply_; ///< \see updatedReply()
mutable String storeId_; ///< StoreId for our entry (usually request URI)
mutable String logUri_; ///< URI used for logging (usually request URI)
projects / thirdparty / squid.git / blobdiff