---------------------
PatchSet 1048 
Date: 2001/01/03 12:11:32
Author: adri
Branch: modio
Tag: (none) 
Log:


Framework for killing seen_offset:

* remove it from the reply_internal object
* make sure seen == copy in storeClientCopy(), so we can catch cases where
  it isn't.

Members: 
	src/reply_internal.c:1.1.2.5->1.1.2.6 
	src/store_client.c:1.2.2.9->1.2.2.10 

Index: squid/src/reply_internal.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/reply_internal.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid/src/reply_internal.c	27 Dec 2000 11:04:06 -0000	1.1.2.5
+++ squid/src/reply_internal.c	3 Jan 2001 12:11:33 -0000	1.1.2.6
@@ -201,7 +201,7 @@
         goto finish;
     }
     if ((e->store_status == STORE_PENDING) &&
-        (sc->seen_offset >= state->inmem_hi)) {
+        (sc->copy_offset >= state->inmem_hi)) {
 	/* client has already seen this, wait for more */
 	debug(20, 3) ("reply_internal_clientcopy3: Waiting for more\n");
         goto finish;
Index: squid/src/store_client.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_client.c,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -r1.2.2.9 -r1.2.2.10
--- squid/src/store_client.c	27 Dec 2000 11:04:06 -0000	1.2.2.9
+++ squid/src/store_client.c	3 Jan 2001 12:11:32 -0000	1.2.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.c,v 1.2.2.9 2000/12/27 11:04:06 adri Exp $
+ * $Id: store_client.c,v 1.2.2.10 2001/01/03 12:11:32 adri Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -118,6 +118,7 @@
 
     assert(sc->callback == NULL);
     assert(sc->entry == e);
+    assert(sc->copy_offset == sc->seen_offset); /* Just until everything has been changed */
     sc->copy_offset = copy_offset;
     sc->seen_offset = seen_offset;
     sc->callback = callback;