/*
- * $Id$
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
- * DEBUG: section 79 Squid-side DISKD I/O functions.
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * CopyRight (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
-#include "squid-old.h"
+/* DEBUG: section 79 Squid-side DISKD I/O functions. */
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/shm.h>
-
-#include "DiskdFile.h"
+#include "squid.h"
#include "ConfigOption.h"
#include "diomsg.h"
-
+#include "DiskdFile.h"
#include "DiskdIOStrategy.h"
#include "DiskIO/IORequestor.h"
#include "DiskIO/ReadRequest.h"
#include "DiskIO/WriteRequest.h"
#include "StatCounters.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;
-}
+#if HAVE_SYS_IPC_H
+#include <sys/ipc.h>
+#endif
+#if HAVE_SYS_MSG_H
+#include <sys/msg.h>
+#endif
+#if HAVE_SYS_SHM_H
+#include <sys/shm.h>
+#endif
-void
-DiskdFile::operator delete(void *address)
-{
- DiskdFile *t = static_cast<DiskdFile *>(address);
- debugs(79, 3, "diskdFile with base " << t << " deleting");
- cbdataFree(t);
-}
+CBDATA_CLASS_INIT(DiskdFile);
-DiskdFile::DiskdFile(char const *aPath, DiskdIOStrategy *anIO) : errorOccured (false), IO(anIO),
- inProgressIOs (0)
+DiskdFile::DiskdFile(char const *aPath, DiskdIOStrategy *anIO) :
+ errorOccured(false),
+ IO(anIO),
+ mode(0),
+ inProgressIOs(0)
{
- assert (aPath);
+ assert(aPath);
debugs(79, 3, "DiskdFile::DiskdFile: " << aPath);
- path_ = xstrdup (aPath);
+ path_ = xstrdup(aPath);
id = diskd_stats.sio_id;
++diskd_stats.sio_id;
}
DiskdFile::~DiskdFile()
{
- assert (inProgressIOs == 0);
+ assert(inProgressIOs == 0);
safe_free (path_);
}
void
-DiskdFile::open(int flags, mode_t aMode, RefCount< IORequestor > callback)
+DiskdFile::open(int flags, mode_t, RefCount<IORequestor> callback)
{
debugs(79, 3, "DiskdFile::open: " << this << " opening for " << callback.getRaw());
- assert (ioRequestor.getRaw() == NULL);
+ assert(ioRequestor.getRaw() == NULL);
ioRequestor = callback;
- assert (callback.getRaw());
+ assert(callback.getRaw());
mode = flags;
ssize_t shm_offset;
char *buf = (char *)IO->shm.get(&shm_offset);
}
void
-DiskdFile::create(int flags, mode_t aMode, RefCount< IORequestor > callback)
+DiskdFile::create(int flags, mode_t, RefCount<IORequestor> callback)
{
debugs(79, 3, "DiskdFile::create: " << this << " creating for " << callback.getRaw());
assert (ioRequestor.getRaw() == NULL);
NULL);
if (x < 0) {
+ int xerrno = errno;
ioCompleted();
errorOccured = true;
// IO->shm.put (shm_offset);
- debugs(79, DBG_IMPORTANT, "storeDiskdSend CREATE: " << xstrerror());
+ debugs(79, DBG_IMPORTANT, "storeDiskdSend CREATE: " << xstrerr(xerrno));
notifyClient();
ioRequestor = NULL;
return;
aRead);
if (x < 0) {
+ int xerrno = errno;
ioCompleted();
errorOccured = true;
// IO->shm.put (shm_offset);
- debugs(79, DBG_IMPORTANT, "storeDiskdSend READ: " << xstrerror());
+ debugs(79, DBG_IMPORTANT, "storeDiskdSend READ: " << xstrerr(xerrno));
notifyClient();
ioRequestor = NULL;
return;
NULL);
if (x < 0) {
+ int xerrno = errno;
ioCompleted();
errorOccured = true;
- debugs(79, DBG_IMPORTANT, "storeDiskdSend CLOSE: " << xstrerror());
+ debugs(79, DBG_IMPORTANT, "storeDiskdSend CLOSE: " << xstrerr(xerrno));
notifyClient();
ioRequestor = NULL;
return;
aRequest);
if (x < 0) {
+ int xerrno = errno;
ioCompleted();
errorOccured = true;
- debugs(79, DBG_IMPORTANT, "storeDiskdSend WRITE: " << xstrerror());
+ debugs(79, DBG_IMPORTANT, "storeDiskdSend WRITE: " << xstrerr(xerrno));
// IO->shm.put (shm_offset);
notifyClient();
ioRequestor = NULL;
debugs(79, 3, "DiskdFile::readDone: status " << M->status);
assert (M->requestor);
ReadRequest::Pointer readRequest = dynamic_cast<ReadRequest *>(M->requestor);
+
/* remove the free protection */
- readRequest->RefCountDereference();
+ if (readRequest != NULL) {
+ const uint32_t lcount = readRequest->unlock();
+ if (lcount == 0)
+ debugs(79, DBG_IMPORTANT, "invariant check failed: readRequest reference count is 0");
+ }
if (M->status < 0) {
++diskd_stats.read.fail;
debugs(79, 3, "storeDiskdWriteDone: status " << M->status);
assert (M->requestor);
WriteRequest::Pointer writeRequest = dynamic_cast<WriteRequest *>(M->requestor);
+
/* remove the free protection */
- writeRequest->RefCountDereference();
+ if (writeRequest != NULL) {
+ const uint32_t lcount = writeRequest->unlock();
+ if (lcount == 0)
+ debugs(79, DBG_IMPORTANT, "invariant check failed: writeRequest reference count is 0");
+ }
if (M->status < 0) {
errorOccured = true;
{
return inProgressIOs != 0;
}
+
projects / thirdparty / squid.git / blobdiff