From: wessels <>
Date: Tue, 23 May 2006 06:39:32 +0000 (+0000)
Subject: StoreIOState updates for COSS
X-Git-Tag: SQUID_3_0_PRE4~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6ee66768ea79b669224744273bf7c9927d9db81;p=thirdparty%2Fsquid.git

StoreIOState updates for COSS
---

diff --git a/src/fs/coss/CossSwapDir.h b/src/fs/coss/CossSwapDir.h
index 21e847b152..fdbda43fc5 100644
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -42,8 +42,8 @@ public:
     virtual int canStore(StoreEntry const &)const;
     virtual int callback();
     virtual void sync();
-    virtual StoreIOState::Pointer createStoreIO(StoreEntry &, STFNCB *, STIOCB *, void *);
-    virtual StoreIOState::Pointer openStoreIO(StoreEntry &, STFNCB *, STIOCB *, void *);
+    virtual StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
+    virtual StoreIOState::Pointer openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
     virtual void openLog();
     virtual void closeLog();
     virtual int writeCleanStart();
diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index b97a06746e..a59a4b7b93 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_coss.cc,v 1.62 2006/05/19 20:22:56 wessels Exp $
+ * $Id: store_dir_coss.cc,v 1.63 2006/05/23 00:39:32 wessels Exp $
  * vim: set et : 
  *
  * DEBUG: section 47    Store COSS Directory Routines
@@ -182,7 +182,7 @@ CossSwapDir::readCompleted(const char *buf, int len, int errflag, RefCount<ReadR
     assert (cossRead);
     StoreIOState::Pointer sio =  cossRead->sio;
     void *cbdata;
-    STRCB *callback = sio->read.callback;
+    StoreIOState::STRCB *callback = sio->read.callback;
     char *p;
     CossState *cstate = dynamic_cast<CossState *>(sio.getRaw());
     ssize_t rlen;
@@ -222,7 +222,7 @@ CossSwapDir::readCompleted(const char *buf, int len, int errflag, RefCount<ReadR
     sio->read.callback = NULL;
 
     if (cbdataReferenceValidDone(sio->read.callback_data, &cbdata))
-        callback(cbdata, cstate->requestbuf, rlen);
+        callback(cbdata, cstate->requestbuf, rlen, sio);
 }
 
 void
diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc
index 9ee80a2e21..2eb0e8f982 100644
--- a/src/fs/coss/store_io_coss.cc
+++ b/src/fs/coss/store_io_coss.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_coss.cc,v 1.28 2006/05/23 00:17:47 wessels Exp $
+ * $Id: store_io_coss.cc,v 1.29 2006/05/23 00:39:32 wessels Exp $
  *
  * DEBUG: section 79    Storage Manager COSS Interface
  * AUTHOR: Eric Stern
@@ -141,7 +141,7 @@ CossSwapDir::unlink(StoreEntry & e)
 }
 
 StoreIOState::Pointer
-CossSwapDir::createStoreIO(StoreEntry &e, STFNCB * file_callback, STIOCB * callback, void *callback_data)
+CossSwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB * file_callback, StoreIOState::STIOCB * callback, void *callback_data)
 {
     CossState *cstate;
     StoreIOState::Pointer sio = new CossState(this);
@@ -189,8 +189,8 @@ CossSwapDir::createStoreIO(StoreEntry &e, STFNCB * file_callback, STIOCB * callb
 }
 
 StoreIOState::Pointer
-CossSwapDir::openStoreIO(StoreEntry & e, STFNCB * file_callback,
-                         STIOCB * callback, void *callback_data)
+CossSwapDir::openStoreIO(StoreEntry & e, StoreIOState::STFNCB * file_callback,
+                         StoreIOState::STIOCB * callback, void *callback_data)
 {
     char *p;
     CossState *cstate;
@@ -249,7 +249,7 @@ CossSwapDir::openStoreIO(StoreEntry & e, STFNCB * file_callback,
         }
 
         /* Notify the upper levels that we've changed file number */
-        sio->file_callback(sio->callback_data, 0);
+        sio->file_callback(sio->callback_data, 0, sio);
 
         /*
          * lock the buffer so it doesn't get swapped out on us
@@ -427,7 +427,7 @@ CossState::doCallback(int errflag)
     this->callback = NULL;
 
     if (cbdataReferenceValidDone(callback_data, &cbdata))
-        callback(cbdata, errflag);
+        callback(cbdata, errflag, this);
 }
 
 char *