1 Index: squid3/src/DelayId.cc
2 diff -c squid3/src/DelayId.cc:1.13 squid3/src/DelayId.cc:1.14
3 *** squid3/src/DelayId.cc:1.13 Sun Aug 10 05:00:40 2003
4 --- squid3/src/DelayId.cc Sat Sep 6 06:47:34 2003
10 ! unsigned short tempPool = pool() - 1;
12 ! assert (tempPool != 0xFFFF);
14 if (compositeId.getRaw())
15 compositeId->bytesIn(qty);
20 ! assert ((unsigned short)(pool() - 1) != 0xFFFF);
22 if (compositeId.getRaw())
23 compositeId->bytesIn(qty);
24 Index: squid3/src/client_side.cc
25 diff -c squid3/src/client_side.cc:1.658 squid3/src/client_side.cc:1.659
26 *** squid3/src/client_side.cc:1.658 Sun Aug 31 21:49:38 2003
27 --- squid3/src/client_side.cc Sat Sep 6 06:47:34 2003
31 static void clientUpdateHierCounters(HierarchyLogEntry *);
32 static bool clientPingHasFinished(ping_data const *aPing);
33 static void clientPrepareLogWithRequestDetails(HttpRequest *, AccessLogEntry *);
35 static int connIsUsable(ConnStateData::Pointer conn);
37 static int responseFinishedOrFailed(HttpReply * rep, StoreIOBuffer const &recievedData);
38 static void ClientSocketContextPushDeferredIfNeeded(ClientSocketContext::Pointer deferredRequest, ConnStateData::Pointer & conn);
39 static void clientUpdateSocketStats(log_type logType, size_t size);
48 connIsUsable(ConnStateData::Pointer conn)
58 ClientSocketContext::Pointer
59 ConnStateData::getCurrentContext() const
63 assert(cbdataReferenceValid(node));
64 /* Set null by ContextFree */
65 assert(node->node.next == NULL);
66 - ClientSocketContext *context = dynamic_cast<ClientSocketContext *>(node->data.getRaw());
67 /* this is the assert discussed above */
68 ! assert(context == NULL);
69 /* We are only called when the client socket shutsdown.
70 * Tell the prev pipeline member we're finished
73 assert(cbdataReferenceValid(node));
74 /* Set null by ContextFree */
75 assert(node->node.next == NULL);
76 /* this is the assert discussed above */
77 ! assert(NULL == dynamic_cast<ClientSocketContext *>(node->data.getRaw()));
78 /* We are only called when the client socket shutsdown.
79 * Tell the prev pipeline member we're finished
81 Index: squid3/src/client_side_request.cc
82 diff -c squid3/src/client_side_request.cc:1.33 squid3/src/client_side_request.cc:1.34
83 *** squid3/src/client_side_request.cc:1.33 Sun Aug 31 21:49:38 2003
84 --- squid3/src/client_side_request.cc Sat Sep 6 06:47:34 2003
87 ClientRequestContext::CheckNoCacheDone(int answer, void *data)
90 ! bool valid = cbdataReferenceValidDone(data, &temp);
91 /* acl NB calls cannot invalidate cbdata in the normal course of things */
93 ClientRequestContext *context = (ClientRequestContext *)temp;
95 ClientRequestContext::CheckNoCacheDone(int answer, void *data)
102 ! cbdataReferenceValidDone(data, &temp);
103 /* acl NB calls cannot invalidate cbdata in the normal course of things */
105 ClientRequestContext *context = (ClientRequestContext *)temp;
106 Index: squid3/src/comm.cc
107 diff -c squid3/src/comm.cc:1.388 squid3/src/comm.cc:1.389
108 *** squid3/src/comm.cc:1.388 Sat Aug 30 19:22:05 2003
109 --- squid3/src/comm.cc Sat Sep 6 06:47:34 2003
113 fill->amountDone += len;
115 ! StoreIOBuffer *sb = &fdc_table[fd].fill.requestedData;
117 ! assert(fill->amountDone <= sb->length);
119 comm_add_fill_callback(fd, fill->amountDone, COMM_OK, 0);
123 fill->amountDone += len;
125 ! assert(fill->amountDone <= fdc_table[fd].fill.requestedData.length);
127 comm_add_fill_callback(fd, fill->amountDone, COMM_OK, 0);
129 Index: squid3/src/errorpage.cc
130 diff -c squid3/src/errorpage.cc:1.191 squid3/src/errorpage.cc:1.192
131 *** squid3/src/errorpage.cc:1.191 Sun Aug 31 21:49:38 2003
132 --- squid3/src/errorpage.cc Sat Sep 6 06:47:35 2003
135 errorAppendEntry(StoreEntry * entry, ErrorState * err)
138 ! MemObject *mem = entry->mem_obj;
139 ! assert(mem != NULL);
140 assert (entry->isEmpty());
142 if (entry->store_status != STORE_PENDING) {
144 errorAppendEntry(StoreEntry * entry, ErrorState * err)
147 ! assert(entry->mem_obj != NULL);
148 assert (entry->isEmpty());
150 if (entry->store_status != STORE_PENDING) {
151 Index: squid3/src/peer_digest.cc
152 diff -c squid3/src/peer_digest.cc:1.99 squid3/src/peer_digest.cc:1.100
153 *** squid3/src/peer_digest.cc:1.99 Sun Aug 10 05:00:44 2003
154 --- squid3/src/peer_digest.cc Sat Sep 6 06:47:35 2003
157 peerDigestHandleReply(void *data, StoreIOBuffer recievedData)
159 DigestFetchState *fetch = (DigestFetchState *)data;
160 - PeerDigest *pd = fetch->pd;
162 digest_read_state_t prevstate;
165 ! assert(pd && recievedData.data);
166 /* The existing code assumes that the recieved pointer is
167 * where we asked the data to be put
170 peerDigestHandleReply(void *data, StoreIOBuffer recievedData)
172 DigestFetchState *fetch = (DigestFetchState *)data;
174 digest_read_state_t prevstate;
177 ! assert(fetch->pd && recievedData.data);
178 /* The existing code assumes that the recieved pointer is
179 * where we asked the data to be put
184 if (size >= (ssize_t)StoreDigestCBlockSize) {
185 PeerDigest *pd = fetch->pd;
186 - HttpReply const *rep = fetch->entry->getReply();
190 if (peerDigestSetCBlock(pd, buf)) {
191 /* XXX: soon we will have variable header size */
194 if (size >= (ssize_t)StoreDigestCBlockSize) {
195 PeerDigest *pd = fetch->pd;
197 ! assert(pd && fetch->entry->getReply());
199 if (peerDigestSetCBlock(pd, buf)) {
200 /* XXX: soon we will have variable header size */
201 Index: squid3/src/stmem.cc
202 diff -c squid3/src/stmem.cc:1.80 squid3/src/stmem.cc:1.81
203 *** squid3/src/stmem.cc:1.80 Mon Aug 4 16:14:42 2003
204 --- squid3/src/stmem.cc Sat Sep 6 06:47:35 2003
207 assert (aNode->canAccept (location));
209 /* these two can go I think */
210 ! size_t copyOffset = location - aNode->nodeBuffer.offset;
211 ! assert (copyOffset == aNode->nodeBuffer.length);
212 size_t copyLen = XMIN (amount, aNode->space());
214 xmemcpy(aNode->nodeBuffer.data + aNode->nodeBuffer.length, source, copyLen);
216 assert (aNode->canAccept (location));
218 /* these two can go I think */
219 ! assert (location - aNode->nodeBuffer.offset == aNode->nodeBuffer.length);
220 size_t copyLen = XMIN (amount, aNode->space());
222 xmemcpy(aNode->nodeBuffer.data + aNode->nodeBuffer.length, source, copyLen);
223 Index: squid3/src/fs/diskd/store_io_diskd.cc
224 diff -c squid3/src/fs/diskd/store_io_diskd.cc:1.38 squid3/src/fs/diskd/store_io_diskd.cc:1.39
225 *** squid3/src/fs/diskd/store_io_diskd.cc:1.38 Sat Aug 23 06:33:04 2003
226 --- squid3/src/fs/diskd/store_io_diskd.cc Sat Sep 6 06:47:36 2003
230 assert (ioRequestor.getRaw() != NULL);
232 ! char *rbuf = (char *)IO->shm.get(&shm_offset);
235 int x = storeDiskdSend(_MQD_READ,
239 assert (ioRequestor.getRaw() != NULL);
241 ! IO->shm.get(&shm_offset);
243 int x = storeDiskdSend(_MQD_READ,
248 debug(79, 1) ("storeDiskdSend: msgsnd: %s\n", xstrerror());
249 cbdataReferenceDone(M.callback_data);
250 ! assert(++send_errors < 100);
251 IO->shm.put (shm_offset);
256 debug(79, 1) ("storeDiskdSend: msgsnd: %s\n", xstrerror());
257 cbdataReferenceDone(M.callback_data);
259 ! if (++send_errors > 100)
260 ! fatal ("over 100 errors sending to the daemon - aborting\n");
262 IO->shm.put (shm_offset);
268 debug(79, 1) ("storeDiskdSend: msgsnd: %s\n", xstrerror());
269 cbdataReferenceDone(M.callback_data);
270 ! assert(++send_errors < 100);
276 debug(79, 1) ("storeDiskdSend: msgsnd: %s\n", xstrerror());
277 cbdataReferenceDone(M.callback_data);
279 ! if (++send_errors > 100)
280 ! fatal ("over 100 errors sending to the daemon - aborting\n");
284 Index: squid3/src/repl/heap/store_repl_heap.cc
285 diff -c squid3/src/repl/heap/store_repl_heap.cc:1.13 squid3/src/repl/heap/store_repl_heap.cc:1.14
286 *** squid3/src/repl/heap/store_repl_heap.cc:1.13 Fri Feb 21 15:50:50 2003
287 --- squid3/src/repl/heap/store_repl_heap.cc Sat Sep 6 06:47:36 2003
290 assert(heap->nwalkers);
292 /* Ok, time to destroy this policy */
293 ! safe_free(policy->_data);
294 memset(policy, 0, sizeof(*policy));
298 assert(heap->nwalkers);
300 /* Ok, time to destroy this policy */
302 memset(policy, 0, sizeof(*policy));
305 Index: squid3/src/repl/lru/store_repl_lru.cc
306 diff -c squid3/src/repl/lru/store_repl_lru.cc:1.14 squid3/src/repl/lru/store_repl_lru.cc:1.15
307 *** squid3/src/repl/lru/store_repl_lru.cc:1.14 Fri Feb 21 15:50:50 2003
308 --- squid3/src/repl/lru/store_repl_lru.cc Sat Sep 6 06:47:39 2003
311 assert(lru->nwalkers);
313 /* Ok, time to destroy this policy */
314 ! safe_free(policy->_data);
315 memset(policy, 0, sizeof(*policy));
319 assert(lru->nwalkers);
321 /* Ok, time to destroy this policy */
323 memset(policy, 0, sizeof(*policy));