-
/*
- * $Id$
- *
- * DEBUG: section 79 Storage Manager UFS Interface
- * 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) 1996-2015 The Squid Software Foundation and contributors
*
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
+/* DEBUG: section 79 Storage Manager UFS Interface */
+
#include "squid.h"
-#include "Store.h"
-#include "Generic.h"
#include "DiskIO/DiskFile.h"
#include "DiskIO/DiskIOStrategy.h"
#include "DiskIO/ReadRequest.h"
#include "DiskIO/WriteRequest.h"
-#include "protos.h"
+#include "Generic.h"
+#include "SquidList.h"
+#include "Store.h"
#include "SwapDir.h"
-#include "UFSStrategy.h"
#include "UFSStoreState.h"
+#include "UFSStrategy.h"
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()
{
* writes and just do the write directly. But for now we'll keep the
* code simpler and always go through the pending_writes queue.
*/
-void
+bool
Fs::Ufs::UFSStoreState::write(char const *buf, size_t size, off_t aOffset, FREE * free_func)
{
debugs(79, 3, "UFSStoreState::write: dirn " << swap_dirn << ", fileno "<<
debugs(79, DBG_IMPORTANT,HERE << "avoid write on theFile with error");
debugs(79, DBG_IMPORTANT,HERE << "calling free_func for " << (void*) buf);
free_func((void*)buf);
- return;
+ return false;
}
queueWrite(buf, size, aOffset, free_func);
drainWriteQueue();
+ return true;
}
/*
}
void
-Fs::Ufs::UFSStoreState::readCompleted(const char *buf, int len, int errflag, RefCount<ReadRequest> result)
+Fs::Ufs::UFSStoreState::readCompleted(const char *buf, int len, int, RefCount<ReadRequest> result)
{
assert (result.getRaw());
reading = false;
}
void
-Fs::Ufs::UFSStoreState::writeCompleted(int errflag, size_t len, RefCount<WriteRequest> writeRequest)
+Fs::Ufs::UFSStoreState::writeCompleted(int, size_t len, RefCount<WriteRequest>)
{
debugs(79, 3, HERE << "dirno " << swap_dirn << ", fileno " <<
std::setfill('0') << std::hex << std::uppercase << std::setw(8) << swap_filen <<
* us that the file has been closed. This must be the last line,
* as theFile may be the only object holding us in memory.
*/
- theFile = NULL; // refcounted
+ theFile = NULL; // refcounted
}
/* ============= THE REAL UFS CODE ================ */
/*
* DPW 2006-05-24
- * This blows. DiskThreadsDiskFile::close() won't actually do the close
+ * This blows. DiskThreadsDiskFile::close() won't actually do the close
* if ioInProgress() is true. So we have to check it here. Maybe someday
* DiskThreadsDiskFile::close() will be modified to have a return value,
* or will remember to do the close for us.