From: Alex Rousskov Date: Mon, 20 Feb 2023 03:07:45 +0000 (+0000) Subject: Removed unused StoreIOState::STFNCB callbacks (#1283) X-Git-Tag: SQUID_6_0_1~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be42c788f07a838da475bec9c6f7409f1d4e3478;p=thirdparty%2Fsquid.git Removed unused StoreIOState::STFNCB callbacks (#1283) Unused since before 2016 commit abf396e that discovered the problem. --- diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc index 6fd9b2a835..38873cd7ec 100644 --- a/src/StoreIOState.cc +++ b/src/StoreIOState.cc @@ -27,13 +27,12 @@ StoreIOState::operator delete (void *) assert(0); } -StoreIOState::StoreIOState(StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) : +StoreIOState::StoreIOState(StoreIOState::STIOCB *cbIo, void *data) : swap_dirn(-1), swap_filen(-1), e(nullptr), mode(O_BINARY), offset_(0), - file_callback(cbFile), callback(cbIo), callback_data(cbdataReference(data)) { diff --git a/src/StoreIOState.h b/src/StoreIOState.h index 3eedc0abad..a3d56d050a 100644 --- a/src/StoreIOState.h +++ b/src/StoreIOState.h @@ -28,18 +28,6 @@ public: */ typedef void STRCB(void *their_data, const char *buf, ssize_t len, StoreIOState::Pointer self); - /* - * STFNCB is the "store file number callback." It is called - * when an underlying storage module has allocated the swap - * file number and also indicates that the swap file has been - * opened for reading or writing. STFNCB functions are passed - * to storeCreate() and storeOpen(). Examples of STFNCB callbacks - * are: - * storeSwapInFileNotify - * storeSwapOutFileNotify - */ - typedef void STFNCB(void *their_data, int errflag, StoreIOState::Pointer self); - /* * STIOCB is the "store close callback" for store files. It * is called when the store file is closed. STIOCB functions @@ -54,7 +42,7 @@ public: void *operator new (size_t amount); void operator delete (void *address); - StoreIOState(StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data); + StoreIOState(StoreIOState::STIOCB *, void *cbData); ~StoreIOState() override; off_t offset() const {return offset_;} @@ -85,7 +73,6 @@ public: StoreEntry *e; /* Need this so the FS layers can play god */ mode_t mode; off_t offset_; ///< number of bytes written or read for this entry so far - STFNCB *file_callback; // XXX: Unused. TODO: Remove. STIOCB *callback; void *callback_data; @@ -99,8 +86,8 @@ public: } flags; }; -StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *); -StoreIOState::Pointer storeOpen(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *); +StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STIOCB *, void *); +StoreIOState::Pointer storeOpen(StoreEntry *, StoreIOState::STIOCB *, void *); void storeClose(StoreIOState::Pointer, int how); void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *); void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *); diff --git a/src/fs/rock/RockHeaderUpdater.cc b/src/fs/rock/RockHeaderUpdater.cc index d0c8e99bbb..b659f13f56 100644 --- a/src/fs/rock/RockHeaderUpdater.cc +++ b/src/fs/rock/RockHeaderUpdater.cc @@ -73,7 +73,6 @@ Rock::HeaderUpdater::startReading() { reader = store->openStoreIO( *update.entry, - nullptr, // unused; see StoreIOState::file_callback &NoteDoneReading, this); readMore("need swap entry metadata"); @@ -168,7 +167,6 @@ Rock::HeaderUpdater::startWriting() { writer = store->createUpdateIO( update, - nullptr, // unused; see StoreIOState::file_callback &NoteDoneWriting, this); Must(writer); diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc index 11d1198715..d86d6c21bc 100644 --- a/src/fs/rock/RockIoState.cc +++ b/src/fs/rock/RockIoState.cc @@ -24,10 +24,9 @@ Rock::IoState::IoState(Rock::SwapDir::Pointer &aDir, StoreEntry *anEntry, - StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) : - StoreIOState(cbFile, cbIo, data), + StoreIOState(cbIo, data), readableAnchor_(nullptr), writeableAnchor_(nullptr), splicingPoint(-1), diff --git a/src/fs/rock/RockIoState.h b/src/fs/rock/RockIoState.h index 70fe5c1812..dd83edc9ca 100644 --- a/src/fs/rock/RockIoState.h +++ b/src/fs/rock/RockIoState.h @@ -29,7 +29,7 @@ class IoState: public ::StoreIOState public: typedef RefCount Pointer; - IoState(Rock::SwapDir::Pointer &aDir, StoreEntry *e, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data); + IoState(Rock::SwapDir::Pointer &, StoreEntry *, StoreIOState::STIOCB *, void *cbData); ~IoState() override; void file(const RefCount &aFile); diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 0950a8a7de..758b49ddf4 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -609,7 +609,7 @@ Rock::SwapDir::canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) } StoreIOState::Pointer -Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) +Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STIOCB * const cbIo, void * const cbData) { if (!theFile || theFile->error()) { debugs(47,4, theFile); @@ -631,7 +631,7 @@ Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreI // If that does not happen, the entry will not decrement the read level! Rock::SwapDir::Pointer self(this); - IoState *sio = new IoState(self, &e, cbFile, cbIo, data); + IoState *sio = new IoState(self, &e, cbIo, cbData); sio->swap_dirn = index; sio->swap_filen = filen; @@ -649,7 +649,7 @@ Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreI } StoreIOState::Pointer -Rock::SwapDir::createUpdateIO(const Ipc::StoreMapUpdate &update, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) +Rock::SwapDir::createUpdateIO(const Ipc::StoreMapUpdate &update, StoreIOState::STIOCB *cbIo, void *data) { if (!theFile || theFile->error()) { debugs(47,4, theFile); @@ -660,7 +660,7 @@ Rock::SwapDir::createUpdateIO(const Ipc::StoreMapUpdate &update, StoreIOState::S Must(update.fresh.fileNo >= 0); Rock::SwapDir::Pointer self(this); - IoState *sio = new IoState(self, update.entry, cbFile, cbIo, data); + IoState *sio = new IoState(self, update.entry, cbIo, data); sio->swap_dirn = index; sio->swap_filen = update.fresh.fileNo; @@ -752,7 +752,7 @@ Rock::SwapDir::noteFreeMapSlice(const Ipc::StoreMapSliceId sliceId) // tries to open an old entry with swap_filen for reading StoreIOState::Pointer -Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) +Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STIOCB * const cbIo, void * const cbData) { if (!theFile || theFile->error()) { debugs(47,4, theFile); @@ -780,7 +780,7 @@ Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOS return nullptr; // we were writing after all Rock::SwapDir::Pointer self(this); - IoState *sio = new IoState(self, &e, cbFile, cbIo, data); + IoState *sio = new IoState(self, &e, cbIo, cbData); sio->swap_dirn = index; sio->swap_filen = e.swap_filen; diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h index a07555a283..786e803df8 100644 --- a/src/fs/rock/RockSwapDir.h +++ b/src/fs/rock/RockSwapDir.h @@ -93,8 +93,8 @@ protected: ConfigOption *getOptionTree() const override; bool allowOptionReconfigure(const char *const option) const override; bool canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const override; - StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; - StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; void maintain() override; void diskFull() override; void reference(StoreEntry &e) override; @@ -125,7 +125,7 @@ protected: int64_t diskOffsetLimit() const; void updateHeadersOrThrow(Ipc::StoreMapUpdate &update); - StoreIOState::Pointer createUpdateIO(const Ipc::StoreMapUpdate &update, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *); + StoreIOState::Pointer createUpdateIO(const Ipc::StoreMapUpdate &, StoreIOState::STIOCB *, void *); void anchorEntry(StoreEntry &e, const sfileno filen, const Ipc::StoreMapAnchor &anchor); diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc index f5852595f8..01f3eac865 100644 --- a/src/fs/ufs/UFSStoreState.cc +++ b/src/fs/ufs/UFSStoreState.cc @@ -326,7 +326,7 @@ Fs::Ufs::UFSStoreState::doCloseCallback(int errflag) /* ============= THE REAL UFS CODE ================ */ Fs::Ufs::UFSStoreState::UFSStoreState(SwapDir * SD, StoreEntry * anEntry, STIOCB * cbIo, void *data) : - StoreIOState(nullptr, cbIo, data), + StoreIOState(cbIo, data), opening(false), creating(false), closing(false), diff --git a/src/fs/ufs/UFSStrategy.cc b/src/fs/ufs/UFSStrategy.cc index 348b78aa2a..5e1a30a586 100644 --- a/src/fs/ufs/UFSStrategy.cc +++ b/src/fs/ufs/UFSStrategy.cc @@ -54,7 +54,7 @@ Fs::Ufs::UFSStrategy::unlinkFile(char const *path) } StoreIOState::Pointer -Fs::Ufs::UFSStrategy::open(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB *, +Fs::Ufs::UFSStrategy::open(SwapDir * const SD, StoreEntry * const e, StoreIOState::STIOCB * aCallback, void *callback_data) { assert (((UFSSwapDir *)SD)->IO == this); @@ -90,7 +90,7 @@ Fs::Ufs::UFSStrategy::open(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB *, } StoreIOState::Pointer -Fs::Ufs::UFSStrategy::create(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB *, +Fs::Ufs::UFSStrategy::create(SwapDir * const SD, StoreEntry * const e, StoreIOState::STIOCB * aCallback, void *callback_data) { assert (((UFSSwapDir *)SD)->IO == this); diff --git a/src/fs/ufs/UFSStrategy.h b/src/fs/ufs/UFSStrategy.h index f9cc8e2a3b..a84ee8e1e4 100644 --- a/src/fs/ufs/UFSStrategy.h +++ b/src/fs/ufs/UFSStrategy.h @@ -33,10 +33,8 @@ public: StoreIOState::Pointer createState(SwapDir *SD, StoreEntry *e, StoreIOState::STIOCB * callback, void *callback_data) const; /* UFS specific */ virtual RefCount newFile (char const *path); - StoreIOState::Pointer open(SwapDir *, StoreEntry *, StoreIOState::STFNCB *, - StoreIOState::STIOCB *, void *); - StoreIOState::Pointer create(SwapDir *, StoreEntry *, StoreIOState::STFNCB *, - StoreIOState::STIOCB *, void *); + StoreIOState::Pointer open(SwapDir *, StoreEntry *, StoreIOState::STIOCB *, void *); + StoreIOState::Pointer create(SwapDir *, StoreEntry *, StoreIOState::STIOCB *, void *); virtual void unlinkFile (char const *); virtual void sync(); diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index 25b0e7f8e0..0cdcef8de7 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -543,15 +543,15 @@ Fs::Ufs::UFSSwapDir::dereference(StoreEntry & e) } StoreIOState::Pointer -Fs::Ufs::UFSSwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB * file_callback, StoreIOState::STIOCB * aCallback, void *callback_data) +Fs::Ufs::UFSSwapDir::createStoreIO(StoreEntry &e, StoreIOState::STIOCB * const aCallback, void * const callback_data) { - return IO->create (this, &e, file_callback, aCallback, callback_data); + return IO->create(this, &e, aCallback, callback_data); } StoreIOState::Pointer -Fs::Ufs::UFSSwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB * file_callback, StoreIOState::STIOCB * aCallback, void *callback_data) +Fs::Ufs::UFSSwapDir::openStoreIO(StoreEntry &e, StoreIOState::STIOCB * const aCallback, void * const callback_data) { - return IO->open (this, &e, file_callback, aCallback, callback_data); + return IO->open(this, &e, aCallback, callback_data); } int diff --git a/src/fs/ufs/UFSSwapDir.h b/src/fs/ufs/UFSSwapDir.h index 6fcc9de9dd..0e23b66f09 100644 --- a/src/fs/ufs/UFSSwapDir.h +++ b/src/fs/ufs/UFSSwapDir.h @@ -56,8 +56,8 @@ public: bool canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const override; void reference(StoreEntry &) override; bool dereference(StoreEntry &) override; - StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; - StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; void openLog() override; void closeLog() override; int writeCleanStart() override; diff --git a/src/store/Disk.h b/src/store/Disk.h index 1674f58310..45c629cba6 100644 --- a/src/store/Disk.h +++ b/src/store/Disk.h @@ -119,8 +119,8 @@ public: /// check whether we can store the entry; if we can, report current load virtual bool canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const = 0; - virtual StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) = 0; - virtual StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) = 0; + virtual StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) = 0; + virtual StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) = 0; bool canLog(StoreEntry const &e)const; virtual void openLog(); diff --git a/src/store_io.cc b/src/store_io.cc index c52352e3d2..178488abcd 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -22,7 +22,7 @@ StoreIoStats store_io_stats; * to select different polices depending on object size or type. */ StoreIOState::Pointer -storeCreate(StoreEntry * e, StoreIOState::STFNCB * file_callback, StoreIOState::STIOCB * close_callback, void *callback_data) +storeCreate(StoreEntry * e, StoreIOState::STIOCB * close_callback, void *callback_data) { assert (e); @@ -41,7 +41,7 @@ storeCreate(StoreEntry * e, StoreIOState::STFNCB * file_callback, StoreIOState:: } /* Now that we have a fs to use, call its storeCreate function */ - StoreIOState::Pointer sio = sd->createStoreIO(*e, file_callback, close_callback, callback_data); + StoreIOState::Pointer sio = sd->createStoreIO(*e, close_callback, callback_data); if (sio == nullptr) ++store_io_stats.create.create_fail; @@ -55,10 +55,10 @@ storeCreate(StoreEntry * e, StoreIOState::STFNCB * file_callback, StoreIOState:: * storeOpen() is purely for reading .. */ StoreIOState::Pointer -storeOpen(StoreEntry * e, StoreIOState::STFNCB * file_callback, StoreIOState::STIOCB * callback, +storeOpen(StoreEntry * e, StoreIOState::STIOCB * callback, void *callback_data) { - return e->disk().openStoreIO(*e, file_callback, callback, callback_data); + return e->disk().openStoreIO(*e, callback, callback_data); } void diff --git a/src/store_swapin.cc b/src/store_swapin.cc index f588cb1441..7b28064688 100644 --- a/src/store_swapin.cc +++ b/src/store_swapin.cc @@ -16,7 +16,6 @@ #include "StoreClient.h" static StoreIOState::STIOCB storeSwapInFileClosed; -static StoreIOState::STFNCB storeSwapInFileNotify; void storeSwapInStart(store_client * sc) @@ -44,7 +43,7 @@ storeSwapInStart(store_client * sc) } assert(e->mem_obj != nullptr); - sc->swapin_sio = storeOpen(e, storeSwapInFileNotify, storeSwapInFileClosed, sc); + sc->swapin_sio = storeOpen(e, storeSwapInFileClosed, sc); } static void @@ -62,18 +61,3 @@ storeSwapInFileClosed(void *data, int errflag, StoreIOState::Pointer) ++statCounter.swap.ins; } -static void -storeSwapInFileNotify(void *data, int, StoreIOState::Pointer) -{ - store_client *sc = (store_client *)data; - StoreEntry *e = sc->entry; - - debugs(1, 3, "storeSwapInFileNotify: changing " << e->swap_filen << "/" << - e->swap_dirn << " to " << sc->swapin_sio->swap_filen << "/" << - sc->swapin_sio->swap_dirn); - - assert(e->swap_filen < 0); // if this fails, call SwapDir::disconnect(e) - e->swap_filen = sc->swapin_sio->swap_filen; - e->swap_dirn = sc->swapin_sio->swap_dirn; -} - diff --git a/src/store_swapout.cc b/src/store_swapout.cc index a30828099d..5c61e7238a 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -26,7 +26,6 @@ static void storeSwapOutStart(StoreEntry * e); static StoreIOState::STIOCB storeSwapOutFileClosed; -static StoreIOState::STFNCB storeSwapOutFileNotify; // wrapper to cross C/C++ ABI boundary. xfree is extern "C" for libraries. static void xfree_cppwrapper(void *x) @@ -61,7 +60,7 @@ storeSwapOutStart(StoreEntry * e) /* Create the swap file */ generic_cbdata *c = new generic_cbdata(e); - sio = storeCreate(e, storeSwapOutFileNotify, storeSwapOutFileClosed, c); + sio = storeCreate(e, storeSwapOutFileClosed, c); if (sio == nullptr) { assert(!e->hasDisk()); @@ -87,13 +86,6 @@ storeSwapOutStart(StoreEntry * e) storeIOWrite(mem->swapout.sio, buf, mem->swap_hdr_sz, 0, xfree_cppwrapper); } -/// XXX: unused, see a related StoreIOState::file_callback -static void -storeSwapOutFileNotify(void *, int, StoreIOState::Pointer) -{ - assert(false); -} - static bool doPages(StoreEntry *anEntry) { diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc index f3346b4a97..69fc6e85ea 100644 --- a/src/tests/TestSwapDir.cc +++ b/src/tests/TestSwapDir.cc @@ -55,13 +55,13 @@ TestSwapDir::canStore(const StoreEntry &, int64_t, int &load) const } StoreIOState::Pointer -TestSwapDir::createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) +TestSwapDir::createStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) { return nullptr; } StoreIOState::Pointer -TestSwapDir::openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) +TestSwapDir::openStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) { return nullptr; } diff --git a/src/tests/TestSwapDir.h b/src/tests/TestSwapDir.h index fe9fd1985f..60009f35c2 100644 --- a/src/tests/TestSwapDir.h +++ b/src/tests/TestSwapDir.h @@ -30,8 +30,8 @@ public: void init() override; bool unlinkdUseful() const override; bool canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const override; - StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; - StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; + StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STIOCB *, void *) override; void parse(int, char*) override; void evictCached(StoreEntry &) override {} void evictIfFound(const cache_key *) override {}