--------------------- PatchSet 330 Date: 2002/12/12 10:37:01 Author: rbcollins Branch: unify-io Tag: (none) Log: write stubs for DiskFiles Members: src/ufscommon.h:1.1.20.24->1.1.20.25 src/fs/aufs/store_asyncufs.h:1.2.12.27->1.2.12.28 src/fs/aufs/store_io_aufs.cc:1.3.12.27->1.3.12.28 src/fs/diskd/store_diskd.h:1.1.20.30->1.1.20.31 src/fs/diskd/store_io_diskd.cc:1.1.20.36->1.1.20.37 src/fs/ufs/store_io_ufs.cc:1.3.10.34->1.3.10.35 src/fs/ufs/store_ufs.h:1.1.20.22->1.1.20.23 Index: squid3/src/ufscommon.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.h,v retrieving revision 1.1.20.24 retrieving revision 1.1.20.25 diff -u -r1.1.20.24 -r1.1.20.25 --- squid3/src/ufscommon.h 12 Dec 2002 09:03:02 -0000 1.1.20.24 +++ squid3/src/ufscommon.h 12 Dec 2002 10:37:01 -0000 1.1.20.25 @@ -1,6 +1,6 @@ /* - * $Id: ufscommon.h,v 1.1.20.24 2002/12/12 09:03:02 rbcollins Exp $ + * $Id: ufscommon.h,v 1.1.20.25 2002/12/12 10:37:01 rbcollins Exp $ * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -99,6 +99,7 @@ virtual void open (int, mode_t, IORequestor::Pointer) = 0; virtual void create (int, mode_t, IORequestor::Pointer) = 0; virtual void read(char *, off_t, size_t) = 0; + virtual void write(char const *buf, size_t size, off_t offset, FREE *free_func) = 0; virtual bool canRead() const = 0; /* During miogration only */ virtual int getFD() const {return -1;} Index: squid3/src/fs/aufs/store_asyncufs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_asyncufs.h,v retrieving revision 1.2.12.27 retrieving revision 1.2.12.28 diff -u -r1.2.12.27 -r1.2.12.28 --- squid3/src/fs/aufs/store_asyncufs.h 12 Dec 2002 09:03:02 -0000 1.2.12.27 +++ squid3/src/fs/aufs/store_asyncufs.h 12 Dec 2002 10:37:02 -0000 1.2.12.28 @@ -93,6 +93,7 @@ virtual void open (int, mode_t, IORequestor::Pointer); virtual void create (int, mode_t, IORequestor::Pointer); virtual void read(char *, off_t, size_t); + virtual void write(char const *buf, size_t size, off_t offset, FREE *free_func); void close(); virtual bool error() const; virtual int getFD() const { return fd;} Index: squid3/src/fs/aufs/store_io_aufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_io_aufs.cc,v retrieving revision 1.3.12.27 retrieving revision 1.3.12.28 diff -u -r1.3.12.27 -r1.3.12.28 --- squid3/src/fs/aufs/store_io_aufs.cc 12 Dec 2002 09:03:02 -0000 1.3.12.27 +++ squid3/src/fs/aufs/store_io_aufs.cc 12 Dec 2002 10:37:02 -0000 1.3.12.28 @@ -263,6 +263,12 @@ return fd > -1; } +void +AUFSFile::write(char const *buf, size_t size, off_t offset, FREE *free_func) +{ + assert (0); +} + /* Write */ void squidaiostate_t::write(char *buf, size_t size, off_t offset, FREE * free_func) Index: squid3/src/fs/diskd/store_diskd.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_diskd.h,v retrieving revision 1.1.20.30 retrieving revision 1.1.20.31 diff -u -r1.1.20.30 -r1.1.20.31 --- squid3/src/fs/diskd/store_diskd.h 12 Dec 2002 09:03:03 -0000 1.1.20.30 +++ squid3/src/fs/diskd/store_diskd.h 12 Dec 2002 10:37:03 -0000 1.1.20.31 @@ -28,6 +28,7 @@ virtual void open (int, mode_t, IORequestor::Pointer); virtual void create (int, mode_t, IORequestor::Pointer); virtual void read(char *, off_t, size_t); + virtual void write(char const *buf, size_t size, off_t offset, FREE *free_func); virtual void close (); virtual bool error() const; virtual bool canRead() const; Index: squid3/src/fs/diskd/store_io_diskd.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_io_diskd.cc,v retrieving revision 1.1.20.36 retrieving revision 1.1.20.37 diff -u -r1.1.20.36 -r1.1.20.37 --- squid3/src/fs/diskd/store_io_diskd.cc 12 Dec 2002 09:03:03 -0000 1.1.20.36 +++ squid3/src/fs/diskd/store_io_diskd.cc 12 Dec 2002 10:37:03 -0000 1.1.20.37 @@ -1,6 +1,6 @@ /* - * $Id: store_io_diskd.cc,v 1.1.20.36 2002/12/12 09:03:03 rbcollins Exp $ + * $Id: store_io_diskd.cc,v 1.1.20.37 2002/12/12 10:37:03 rbcollins Exp $ * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels @@ -482,6 +482,12 @@ } void +DiskdFile::write(char const *buf, size_t size, off_t offset, FREE *free_func) +{ + assert (0); +} + +void diskdstate_t::write(char *buf, size_t size, off_t offset, FREE * free_func) { SwapDir *SD = INDEXSD(swap_dirn); Index: squid3/src/fs/ufs/store_io_ufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_io_ufs.cc,v retrieving revision 1.3.10.34 retrieving revision 1.3.10.35 diff -u -r1.3.10.34 -r1.3.10.35 --- squid3/src/fs/ufs/store_io_ufs.cc 12 Dec 2002 09:03:03 -0000 1.3.10.34 +++ squid3/src/fs/ufs/store_io_ufs.cc 12 Dec 2002 10:37:03 -0000 1.3.10.35 @@ -1,6 +1,6 @@ /* - * $Id: store_io_ufs.cc,v 1.3.10.34 2002/12/12 09:03:03 rbcollins Exp $ + * $Id: store_io_ufs.cc,v 1.3.10.35 2002/12/12 10:37:03 rbcollins Exp $ * * DEBUG: section 79 Storage Manager UFS Interface * AUTHOR: Duane Wessels @@ -293,6 +293,12 @@ } void +UFSFile::write(char const *buf, size_t size, off_t offset, FREE *free_func) +{ + assert (0); +} + +void ufsstate_t::write(char *buf, size_t size, off_t offset, FREE * free_func) { debug(79, 3) ("storeUfsWrite: dirn %d, fileno %08X, FD %d\n", swap_dirn, swap_filen, fd); Index: squid3/src/fs/ufs/store_ufs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/Attic/store_ufs.h,v retrieving revision 1.1.20.22 retrieving revision 1.1.20.23 diff -u -r1.1.20.22 -r1.1.20.23 --- squid3/src/fs/ufs/store_ufs.h 12 Dec 2002 09:03:03 -0000 1.1.20.22 +++ squid3/src/fs/ufs/store_ufs.h 12 Dec 2002 10:37:03 -0000 1.1.20.23 @@ -18,6 +18,7 @@ virtual void open (int, mode_t, IORequestor::Pointer); virtual void create (int, mode_t, IORequestor::Pointer); virtual void read(char *, off_t, size_t); + virtual void write(char const *buf, size_t size, off_t offset, FREE *free_func); virtual void close (); virtual bool error() const; virtual int getFD() const { return fd;}