{
public:
- void *operator new(size_t);
- void operator delete(void *);
-
ClientRequestContext(ClientHttpRequest *);
~ClientRequestContext();
bool readNextRequest; ///< whether Squid should read after error handling
private:
- CBDATA_CLASS(ClientRequestContext);
+ CBDATA_CLASS2(ClientRequestContext);
};
#endif /* SQUID_CLIENTREQUESTCONTEXT_H */
#endif
CBDATA_CLASS_INIT(AIODiskFile);
-void *
-AIODiskFile::operator new(size_t unused)
-{
- CBDATA_INIT_TYPE(AIODiskFile);
- return cbdataAlloc(AIODiskFile);
-}
-
-void
-AIODiskFile::operator delete(void *address)
-{
- cbdataFree(address);
-}
AIODiskFile::AIODiskFile(char const *aPath, AIODiskIOStrategy *aStrategy) : fd(-1), closed(true), error_(false)
{
public:
friend class AIODiskIOStrategy;
- void * operator new (size_t);
- void operator delete (void *);
AIODiskFile (char const *path, AIODiskIOStrategy *);
~AIODiskFile();
RefCount<IORequestor> ioRequestor;
bool closed;
bool error_;
- CBDATA_CLASS(AIODiskFile);
+ CBDATA_CLASS2(AIODiskFile);
};
#endif /* USE_DISKIO_AIO */
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-CBDATA_CLASS_INIT(BlockingFile);
-
-void *
-BlockingFile::operator new(size_t sz)
-{
- CBDATA_INIT_TYPE(BlockingFile);
- BlockingFile *result = cbdataAlloc(BlockingFile);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return result;
-}
-void
-BlockingFile::operator delete(void *address)
-{
- BlockingFile *t = static_cast<BlockingFile *>(address);
- cbdataFree(t);
-}
+CBDATA_CLASS_INIT(BlockingFile);
BlockingFile::BlockingFile(char const *aPath) : fd (-1), closed (true), error_(false)
{
{
public:
- void *operator new(size_t);
- void operator delete(void *);
BlockingFile(char const *path);
~BlockingFile();
virtual void open(int flags, mode_t mode, RefCount<IORequestor> callback);
void readDone(int fd, const char *buf, int len, int errflag);
void writeDone(int fd, int errflag, size_t len);
- CBDATA_CLASS(BlockingFile);
+ CBDATA_CLASS2(BlockingFile);
};
#endif /* SQUID_BLOCKINGFILE_H */
CBDATA_CLASS_INIT(DiskdFile);
-void *
-DiskdFile::operator new(size_t unused)
-{
- CBDATA_INIT_TYPE(DiskdFile);
- DiskdFile *result = cbdataAlloc(DiskdFile);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- debugs(79, 3, "diskdFile with base " << result << " allocating");
- return result;
-}
-
-void
-DiskdFile::operator delete(void *address)
-{
- DiskdFile *t = static_cast<DiskdFile *>(address);
- debugs(79, 3, "diskdFile with base " << t << " deleting");
- cbdataFree(t);
-}
-
DiskdFile::DiskdFile(char const *aPath, DiskdIOStrategy *anIO) :
errorOccured(false),
IO(anIO),
{
public:
- void * operator new(size_t);
- void operator delete(void *);
DiskdFile(char const *path, DiskdIOStrategy *);
~DiskdFile();
virtual void open(int flags, mode_t aMode, RefCount<IORequestor> callback);
void ioCompleted();
size_t inProgressIOs;
- CBDATA_CLASS(DiskdFile);
+ CBDATA_CLASS2(DiskdFile);
};
#endif
/* === PUBLIC =========================================================== */
CBDATA_CLASS_INIT(DiskThreadsDiskFile);
-void *
-DiskThreadsDiskFile::operator new (size_t)
-{
- CBDATA_INIT_TYPE(DiskThreadsDiskFile);
- DiskThreadsDiskFile *result = cbdataAlloc(DiskThreadsDiskFile);
- /*
- * We used to call squidaio_init() here, but if the first transaction
- * is to unlink a file (e.g., if Squid starts up over the disk space
- * limit) then "squidaio" won't be initialized yet.
- */
-
- return result;
-}
-
-void
-DiskThreadsDiskFile::operator delete(void *address)
-{
- DiskThreadsDiskFile *t = static_cast<DiskThreadsDiskFile *>(address);
- cbdataFree(t);
-}
DiskThreadsDiskFile::DiskThreadsDiskFile(char const *aPath, DiskThreadsIOStrategy *anIO):fd(-1), errorOccured (false), IO(anIO),
inProgressIOs (0)
{
public:
- void * operator new(size_t);
- void operator delete(void *);
DiskThreadsDiskFile(char const *path, DiskThreadsIOStrategy *);
~DiskThreadsDiskFile();
virtual void open(int flags, mode_t mode, RefCount<IORequestor> callback);
void readDone(int fd, const char *buf, int len, int errflag, RefCount<ReadRequest> request);
void writeDone(int fd, int errflag, size_t len, RefCount<WriteRequest> request);
- CBDATA_CLASS(DiskThreadsDiskFile);
+ CBDATA_CLASS2(DiskThreadsDiskFile);
};
#include "DiskIO/ReadRequest.h"
void *buf; ///< buffer returned by mmap, needed for munmap
};
-void *
-MmappedFile::operator new(size_t sz)
-{
- CBDATA_INIT_TYPE(MmappedFile);
- MmappedFile *result = cbdataAlloc(MmappedFile);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return result;
-}
-
-void
-MmappedFile::operator delete(void *address)
-{
- MmappedFile *t = static_cast<MmappedFile *>(address);
- cbdataFree(t);
-}
-
MmappedFile::MmappedFile(char const *aPath): fd(-1),
minOffset(0), maxOffset(-1), error_(false)
{
{
public:
- void *operator new(size_t);
- void operator delete(void *);
MmappedFile(char const *path);
~MmappedFile();
virtual void open(int flags, mode_t mode, RefCount<IORequestor> callback);
void doClose();
- CBDATA_CLASS(MmappedFile);
+ CBDATA_CLASS2(MmappedFile);
};
#endif /* SQUID_MMAPPEDFILE_H */
CBDATA_CLASS_INIT(ExternalACLEntry);
-void *
-ExternalACLEntry::operator new (size_t byteCount)
-{
- /* derived classes with different sizes must implement their own new */
- assert (byteCount == sizeof (ExternalACLEntry));
- CBDATA_INIT_TYPE(ExternalACLEntry);
- return cbdataAlloc(ExternalACLEntry);
-}
-
-void
-ExternalACLEntry::operator delete (void *address)
-{
- cbdataFree (address);
-}
-
ExternalACLEntry::ExternalACLEntry()
{
lru.next = lru.prev = NULL;
{
public:
- void *operator new (size_t bytesToAllocate);
- void operator delete (void *address);
-
ExternalACLEntry();
~ExternalACLEntry();
external_acl *def;
private:
- CBDATA_CLASS(ExternalACLEntry);
+ CBDATA_CLASS2(ExternalACLEntry);
};
typedef class ExternalACLEntry external_acl_entry;
{
public:
- void *operator new (size_t);
- void operator delete(void *);
-
CachePeer *peer; /**< pointer back to peer structure, argh */
CacheDigest *cd; /**< actual digest structure */
String host; /**< copy of peer->host */
} stats;
private:
- CBDATA_CLASS(PeerDigest);
+ CBDATA_CLASS2(PeerDigest);
};
extern const Version CacheDigestVer;
{
public:
- void *operator new (size_t);
- void operator delete (void *);
store_client(StoreEntry *);
~store_client();
bool memReaderHasLowerOffset(int64_t) const;
} _callback;
private:
- CBDATA_CLASS(store_client);
+ CBDATA_CLASS2(store_client);
};
void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *);
CBDATA_CLASS_INIT(ClientSocketContext);
-void *
-ClientSocketContext::operator new (size_t byteCount)
-{
- /* derived classes with different sizes must implement their own new */
- assert (byteCount == sizeof (ClientSocketContext));
- CBDATA_INIT_TYPE(ClientSocketContext);
- return cbdataAlloc(ClientSocketContext);
-}
-
-void
-ClientSocketContext::operator delete (void *address)
-{
- cbdataFree (address);
-}
-
/* Local functions */
/* ClientSocketContext */
static ClientSocketContext *ClientSocketContextNew(const Comm::ConnectionPointer &clientConn, ClientHttpRequest *);
public:
typedef RefCount<ClientSocketContext> Pointer;
- void *operator new(size_t);
- void operator delete(void *);
ClientSocketContext();
~ClientSocketContext();
bool startOfOutput() const;
bool mayUseConnection_; /* This request may use the connection. Don't read anymore requests for now */
bool connRegistered_;
- CBDATA_CLASS(ClientSocketContext);
+ CBDATA_CLASS2(ClientSocketContext);
};
class ConnectionDetail;
aHttpRequest->storeEntry(reference);
}
-void *
-clientReplyContext::operator new (size_t byteCount)
-{
- /* derived classes with different sizes must implement their own new */
- assert (byteCount == sizeof (clientReplyContext));
- CBDATA_INIT_TYPE(clientReplyContext);
- return cbdataAlloc(clientReplyContext);
-}
-
-void
-clientReplyContext::operator delete (void *address)
-{
- clientReplyContext * tmp = (clientReplyContext *)address;
- cbdataFree (tmp);
-}
-
void
clientReplyContext::saveState()
{
{
public:
- void *operator new (size_t byteCount);
- void operator delete (void *address);
static STCB CacheHit;
static STCB HandleIMSReply;
static STCB SendMoreData;
store_client *old_sc; /* ... for entry to be validated */
bool deleting;
- CBDATA_CLASS(clientReplyContext);
+ CBDATA_CLASS2(clientReplyContext);
};
#endif /* SQUID_CLIENTSIDEREPLY_H */
CBDATA_CLASS_INIT(ClientRequestContext);
-void *
-ClientRequestContext::operator new (size_t size)
-{
- assert (size == sizeof(ClientRequestContext));
- CBDATA_INIT_TYPE(ClientRequestContext);
- ClientRequestContext *result = cbdataAlloc(ClientRequestContext);
- return result;
-}
-
-void
-ClientRequestContext::operator delete (void *address)
-{
- ClientRequestContext *t = static_cast<ClientRequestContext *>(address);
- cbdataFree(t);
-}
-
/* Local functions */
/* other */
static void clientAccessCheckDoneWrapper(allow_t, void *);
CBDATA_CLASS_INIT(ClientHttpRequest);
-void *
-ClientHttpRequest::operator new (size_t size)
-{
- assert (size == sizeof (ClientHttpRequest));
- CBDATA_INIT_TYPE(ClientHttpRequest);
- ClientHttpRequest *result = cbdataAlloc(ClientHttpRequest);
- return result;
-}
-
-void
-ClientHttpRequest::operator delete (void *address)
-{
- ClientHttpRequest *t = static_cast<ClientHttpRequest *>(address);
- cbdataFree(t);
-}
-
ClientHttpRequest::ClientHttpRequest(ConnStateData * aConn) :
#if USE_ADAPTATION
AsyncJob("ClientHttpRequest"),
{
public:
- void *operator new (size_t);
- void operator delete (void *);
-#if USE_ADAPTATION
- void *toCbdata() { return this; }
-#endif
ClientHttpRequest(ConnStateData *csd);
~ClientHttpRequest();
/* Not implemented - present to prevent synthetic operations */
#endif
private:
- CBDATA_CLASS(ClientHttpRequest);
+ CBDATA_CLASS2(ClientHttpRequest);
};
/* client http based routines */
public:
typedef RefCount<ESIContext> Pointer;
- void *operator new (size_t byteCount);
- void operator delete (void *address);
ESIContext() :
thisNode(NULL),
http(NULL),
virtual void parserComment (const char *s);
bool processing;
- CBDATA_CLASS(ESIContext);
+ CBDATA_CLASS2(ESIContext);
};
#endif /* SQUID_ESICONTEXT_H */
/* ESIContext */
static ESIContext *ESIContextNew(HttpReply *, clientStreamNode *, ClientHttpRequest *);
-void *
-ESIContext::operator new(size_t byteCount)
-{
- assert (byteCount == sizeof (ESIContext));
- CBDATA_INIT_TYPE(ESIContext);
- ESIContext *result = cbdataAlloc(ESIContext);
- return result;
-}
-
-void
-ESIContext::operator delete (void *address)
-{
- ESIContext *t = static_cast<ESIContext *>(address);
- cbdataFree(t);
-}
-
void
ESIContext::setError()
{
include = NULL;
}
-void *
-ESIStreamContext::operator new(size_t byteCount)
-{
- assert (byteCount == sizeof (ESIStreamContext));
- CBDATA_INIT_TYPE(ESIStreamContext);
- ESIStreamContext *result = cbdataAlloc(ESIStreamContext);
- return result;
-}
-
-void
-ESIStreamContext::operator delete (void *address)
-{
- ESIStreamContext *t = static_cast<ESIStreamContext *>(address);
- cbdataFree(t);
-}
-
ESIStreamContext *
ESIStreamContextNew (ESIIncludePtr include)
{
public:
typedef RefCount<ESIStreamContext> Pointer;
- void *operator new(size_t);
- void operator delete(void *);
ESIStreamContext();
~ESIStreamContext();
void freeResources();
ESISegment::Pointer buffer;
private:
- CBDATA_CLASS(ESIStreamContext);
+ CBDATA_CLASS2(ESIStreamContext);
};
/* ESIInclude */
{
public:
- void * operator new (size_t);
- void operator delete (void *);
CossRead(ReadRequest const &base, StoreIOState::Pointer anSio) : ReadRequest(base) , sio(anSio) {}
StoreIOState::Pointer sio;
private:
- CBDATA_CLASS(CossRead);
+ CBDATA_CLASS2(CossRead);
};
#include "DiskIO/WriteRequest.h"
{
public:
- void * operator new (size_t);
- void operator delete (void *);
CossWrite(WriteRequest const &base, CossMemBuf *aBuf) : WriteRequest(base) , membuf(aBuf) {}
CossMemBuf *membuf;
private:
- CBDATA_CLASS(CossWrite);
+ CBDATA_CLASS2(CossWrite);
};
#endif
/* === STATIC =========================================================== */
CBDATA_CLASS_INIT(CossRead);
-void *
-CossRead::operator new (size_t)
-{
- CBDATA_INIT_TYPE(CossRead);
- CossRead *result = cbdataAlloc(CossRead);
- return result;
-}
-
-void
-CossRead::operator delete (void *address)
-{
- cbdataFree(address);
-}
-
CBDATA_CLASS_INIT(CossWrite);
-void *
-CossWrite::operator new (size_t)
-{
- CBDATA_INIT_TYPE(CossWrite);
- CossWrite *result = cbdataAlloc(CossWrite);
- return result;
-}
-
-void
-CossWrite::operator delete (void *address)
-{
- cbdataFree(address);
-}
void
CossState::doCallback(int errflag)
CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,UFSStoreState);
-void *
-Fs::Ufs::UFSStoreState::operator new (size_t)
-{
- CBDATA_INIT_TYPE(UFSStoreState);
- return cbdataAlloc(UFSStoreState);
-}
-
-void
-Fs::Ufs::UFSStoreState::operator delete (void *address)
-{
- cbdataFree(address);
-}
-
void
Fs::Ufs::UFSStoreState::ioCompletedNotification()
{
class UFSStoreState : public StoreIOState, public IORequestor
{
public:
- void * operator new (size_t);
- void operator delete (void *);
UFSStoreState(SwapDir * SD, StoreEntry * anEntry, STIOCB * callback_, void *callback_data_);
~UFSStoreState();
virtual void close(int how);
void openDone();
void freePending();
void doWrite();
- CBDATA_CLASS(UFSStoreState);
+ CBDATA_CLASS2(UFSStoreState);
};
MEMPROXY_CLASS_INLINE(UFSStoreState::_queued_read);
CBDATA_CLASS_INIT(PeerDigest);
-void *
-PeerDigest::operator new (size_t)
-{
- CBDATA_INIT_TYPE(PeerDigest);
- PeerDigest *result = cbdataAlloc(PeerDigest);
- return result;
-}
-
-void
-PeerDigest::operator delete (void *address)
-{
- PeerDigest *t = static_cast<PeerDigest *>(address);
- cbdataFree(t);
-}
-
/* allocate new peer digest, call Init, and lock everything */
PeerDigest *
peerDigestCreate(CachePeer * p)
CBDATA_CLASS_INIT(store_client);
-void *
-store_client::operator new (size_t)
-{
- CBDATA_INIT_TYPE(store_client);
- store_client *result = cbdataAlloc(store_client);
- return result;
-}
-
-void
-store_client::operator delete (void *address)
-{
- store_client *t = static_cast<store_client *>(address);
- cbdataFree(t);
-}
-
bool
store_client::memReaderHasLowerOffset(int64_t anOffset) const
{
void ClientSocketContext::registerWithConn() STUB
void ClientSocketContext::noteIoError(const int xerrno) STUB
void ClientSocketContext::writeControlMsg(HttpControlMsg &msg) STUB
-void ClientSocketContext::operator delete(void *address) STUB
void ConnStateData::readSomeData() STUB
int ConnStateData::getAvailableBufferLength() const STUB_RETVAL(0)
projects / thirdparty / squid.git / commitdiff
