--------------------- PatchSet 328 Date: 2002/12/12 09:03:02 Author: rbcollins Branch: unify-io Tag: (none) Log: create writeCompleted stubs Members: src/ufscommon.h:1.1.20.23->1.1.20.24 src/fs/aufs/store_asyncufs.h:1.2.12.26->1.2.12.27 src/fs/aufs/store_io_aufs.cc:1.3.12.26->1.3.12.27 src/fs/diskd/store_diskd.h:1.1.20.29->1.1.20.30 src/fs/diskd/store_io_diskd.cc:1.1.20.35->1.1.20.36 src/fs/ufs/store_io_ufs.cc:1.3.10.33->1.3.10.34 src/fs/ufs/store_ufs.h:1.1.20.21->1.1.20.22 Index: squid3/src/ufscommon.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.h,v retrieving revision 1.1.20.23 retrieving revision 1.1.20.24 diff -u -r1.1.20.23 -r1.1.20.24 --- squid3/src/ufscommon.h 12 Dec 2002 02:11:31 -0000 1.1.20.23 +++ squid3/src/ufscommon.h 12 Dec 2002 09:03:02 -0000 1.1.20.24 @@ -1,6 +1,6 @@ /* - * $Id: ufscommon.h,v 1.1.20.23 2002/12/12 02:11:31 rbcollins Exp $ + * $Id: ufscommon.h,v 1.1.20.24 2002/12/12 09:03:02 rbcollins Exp $ * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -88,7 +88,8 @@ typedef RefCount Pointer; virtual void ioCompletedNotification() = 0; virtual void closeCompleted() = 0; - virtual void readCompleted(const char *buf, int len, int errflag){} + virtual void readCompleted(const char *buf, int len, int errflag) = 0; + virtual void writeCompleted(int errflag, size_t len) = 0; }; class DiskFile : public RefCountable { 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.26 retrieving revision 1.2.12.27 diff -u -r1.2.12.26 -r1.2.12.27 --- squid3/src/fs/aufs/store_asyncufs.h 12 Dec 2002 02:31:20 -0000 1.2.12.26 +++ squid3/src/fs/aufs/store_asyncufs.h 12 Dec 2002 09:03:02 -0000 1.2.12.27 @@ -135,6 +135,7 @@ void ioCompletedNotification(); void closeCompleted(); void readCompleted(const char *buf, int len, int errflag); + void writeCompleted(int errflag, size_t len); private: CBDATA_CLASS(squidaiostate_t); void openDone(); 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.26 retrieving revision 1.3.12.27 diff -u -r1.3.12.26 -r1.3.12.27 --- squid3/src/fs/aufs/store_io_aufs.cc 12 Dec 2002 02:31:20 -0000 1.3.12.26 +++ squid3/src/fs/aufs/store_io_aufs.cc 12 Dec 2002 09:03:02 -0000 1.3.12.27 @@ -395,6 +395,11 @@ } +void +squidaiostate_t::writeCompleted(int errflag, size_t len) +{ + assert (0); +} #if ASYNC_WRITE static void 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.29 retrieving revision 1.1.20.30 diff -u -r1.1.20.29 -r1.1.20.30 --- squid3/src/fs/diskd/store_diskd.h 12 Dec 2002 02:15:23 -0000 1.1.20.29 +++ squid3/src/fs/diskd/store_diskd.h 12 Dec 2002 09:03:03 -0000 1.1.20.30 @@ -73,6 +73,7 @@ void ioCompletedNotification(); void readCompleted(const char *buf, int len, int errflag); + void writeCompleted(int errflag, size_t len); void closeCompleted(); void write(char *buf, size_t size, off_t offset, FREE * free_func); private: 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.35 retrieving revision 1.1.20.36 diff -u -r1.1.20.35 -r1.1.20.36 --- squid3/src/fs/diskd/store_io_diskd.cc 12 Dec 2002 02:15:23 -0000 1.1.20.35 +++ squid3/src/fs/diskd/store_io_diskd.cc 12 Dec 2002 09:03:03 -0000 1.1.20.36 @@ -1,6 +1,6 @@ /* - * $Id: store_io_diskd.cc,v 1.1.20.35 2002/12/12 02:15:23 rbcollins Exp $ + * $Id: store_io_diskd.cc,v 1.1.20.36 2002/12/12 09:03:03 rbcollins Exp $ * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels @@ -608,6 +608,12 @@ } } +void +diskdstate_t::writeCompleted(int errflag, size_t len) +{ + assert (0); +} + static void storeDiskdWriteDone(diomsg * M) { 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.33 retrieving revision 1.3.10.34 diff -u -r1.3.10.33 -r1.3.10.34 --- squid3/src/fs/ufs/store_io_ufs.cc 12 Dec 2002 02:31:20 -0000 1.3.10.33 +++ squid3/src/fs/ufs/store_io_ufs.cc 12 Dec 2002 09:03:03 -0000 1.3.10.34 @@ -1,6 +1,6 @@ /* - * $Id: store_io_ufs.cc,v 1.3.10.33 2002/12/12 02:31:20 rbcollins Exp $ + * $Id: store_io_ufs.cc,v 1.3.10.34 2002/12/12 09:03:03 rbcollins Exp $ * * DEBUG: section 79 Storage Manager UFS Interface * AUTHOR: Duane Wessels @@ -357,6 +357,12 @@ fatal("Sync ufs doesn't support overlapped close and read calls\n"); } +void +ufsstate_t::writeCompleted(int errflag, size_t len) +{ + assert (0); +} + static void storeUfsWriteDone(int fd, int errflag, size_t len, void *my_data) { 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.21 retrieving revision 1.1.20.22 diff -u -r1.1.20.21 -r1.1.20.22 --- squid3/src/fs/ufs/store_ufs.h 12 Dec 2002 02:11:32 -0000 1.1.20.21 +++ squid3/src/fs/ufs/store_ufs.h 12 Dec 2002 09:03:03 -0000 1.1.20.22 @@ -43,6 +43,7 @@ void write(char *buf, size_t size, off_t offset, FREE * free_func); void ioCompletedNotification(); void readCompleted(const char *buf, int len, int errflag); + void writeCompleted(int errflag, size_t len); void closeCompleted(); private: CBDATA_CLASS(ufsstate_t);