Index: client_side.c =================================================================== RCS file: /cvsroot/squid/squid/src/client_side.c,v retrieving revision 1.27.2.2.4.46.2.6 diff -u -r1.27.2.2.4.46.2.6 client_side.c --- client_side.c 11 Jun 2002 08:45:04 -0000 1.27.2.2.4.46.2.6 +++ client_side.c 16 Jun 2002 16:34:56 -0000 @@ -1713,8 +1713,7 @@ body_size, rep->hdr_sz); CBDATA_INIT_TYPE(clientCheckHeaderStateData); state = cbdataAlloc(clientCheckHeaderStateData); - state->http = http; - cbdataLock(http); + state->http = cbdataReference(http); state->rep = rep; state->buf = buf; state->size = size; @@ -1728,7 +1727,7 @@ { HttpReply *rep = state->rep; aclCheck_t *ch; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1750,7 +1749,7 @@ clientHttpLocationRewriteCheckDone(int answer, void *data) { clientCheckHeaderStateData *state = data; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1766,7 +1765,7 @@ clientHttpLocationRewrite(clientCheckHeaderStateData * state) { HttpReply *rep = state->rep; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1784,7 +1783,7 @@ clientHttpRequest *http = state->http; HttpReply *rep = state->rep; ConnStateData *conn = http->conn; - if (!cbdataValid(http)) { + if (!cbdataReferenceValid(http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1810,7 +1809,7 @@ clientHttpReplyAccessCheck(clientCheckHeaderStateData * state) { aclCheck_t *ch; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1842,7 +1841,7 @@ clientCheckHeaderStateData *state = data; clientHttpRequest *http = state->http; HttpReply *rep = state->rep; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1875,7 +1874,7 @@ clientCheckErrorMapDone(StoreEntry * e, int body_offset, ssize_t content_length, void *data) { clientCheckHeaderStateData *state = data; - if (!cbdataValid(state->http)) { + if (!cbdataReferenceValid(state->http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1908,7 +1907,7 @@ { clientHttpRequest *http = state->http; HttpReply *rep = state->rep; - if (!cbdataValid(http)) { + if (!cbdataReferenceValid(http)) { /* oops.. */ clientCheckHeaderDone(state); return; @@ -1933,7 +1932,7 @@ clientHttpRequest *http = state->http; MemBuf mb; cbdataFree(state); - if (!cbdataValid(http)) + if (!cbdataReferenceValid(http)) goto aborted; /* reset range iterator */ http->range_iter.pos = HttpHdrRangeInitPos; @@ -1958,7 +1957,7 @@ comm_write_mbuf(http->conn->fd, mb, clientWriteComplete, http); /* clean up */ aborted: - cbdataUnlock(http); + cbdataReferenceDone(http); http = NULL; } @@ -3169,8 +3168,7 @@ } debug(33, 4) ("httpAccept: FD %d: accepted\n", fd); connState = cbdataAlloc(ConnStateData); - connState->port = s; - cbdataLock(connState->port); + connState->port = cbdataReference(s); connState->peer = peer; connState->log_addr = peer.sin_addr; connState->log_addr.s_addr &= Config.Addrs.client_netmask.s_addr; Index: locrewrite.c =================================================================== RCS file: /cvsroot/squid/squid/src/Attic/locrewrite.c,v retrieving revision 1.1.2.7 diff -u -r1.1.2.7 locrewrite.c --- locrewrite.c 19 Oct 2001 23:26:49 -0000 1.1.2.7 +++ locrewrite.c 16 Jun 2002 16:34:56 -0000 @@ -62,8 +62,8 @@ if (*reply == '\0') reply = NULL; } - valid = cbdataValid(r->data); - cbdataUnlock(r->data); + valid = cbdataReferenceValid(r->data); + cbdataReferenceDone(r->data); if (valid) r->handler(r->data, reply); locationRewriteStateFree(r); @@ -120,8 +120,7 @@ r = cbdataAlloc(rewriteStateData); r->orig_url = xstrdup(location); r->handler = handler; - r->data = data; - cbdataLock(r->data); + r->data = cbdataReference(data); snprintf(buf, 8192, "%s %s %s\n", r->orig_url, http->uri, urlgroup); helperSubmit(locrewriters, buf, locationRewriteHandleReply, r); Index: main.c =================================================================== RCS file: /cvsroot/squid/squid/src/main.c,v retrieving revision 1.21.2.2.4.16.4.1 diff -u -r1.21.2.2.4.16.4.1 main.c --- main.c 11 Jun 2002 08:45:07 -0000 1.21.2.2.4.16.4.1 +++ main.c 16 Jun 2002 16:34:57 -0000 @@ -151,9 +151,10 @@ case 'Y': opt_reload_hit_only = 1; break; - case 'a': +/* case 'a': parse_sockaddr_in_list_token(&Config.Sockaddr.http, optarg); break; +*/ case 'd': opt_debug_stderr = atoi(optarg); break; Index: peer_monitor.c =================================================================== RCS file: /cvsroot/squid/squid/src/Attic/peer_monitor.c,v retrieving revision 1.1.2.10.4.2 diff -u -r1.1.2.10.4.2 peer_monitor.c --- peer_monitor.c 5 Jun 2002 16:20:53 -0000 1.1.2.10.4.2 +++ peer_monitor.c 16 Jun 2002 16:34:57 -0000 @@ -63,7 +63,7 @@ freePeerMonitor(void *data) { PeerMonitor *pm = data; - cbdataUnlock(pm->peer); + cbdataReferenceDone(pm->peer); pm->peer = NULL; } @@ -203,8 +203,7 @@ CBDATA_INIT_TYPE_FREECB(PeerMonitor, freePeerMonitor); pm = cbdataAlloc(PeerMonitor); snprintf(pm->name, sizeof(pm->name), "monitor %s", peer->name); - pm->peer = peer; - cbdataLock(pm->peer); + pm->peer = cbdataReference(peer); if (*url == '/') { snprintf(pm->url, sizeof(pm->url), "http://%s:%d%s", pm->peer->host, pm->peer->http_port, url); Index: peer_sourcehash.c =================================================================== RCS file: /cvsroot/squid/squid/src/Attic/peer_sourcehash.c,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 peer_sourcehash.c --- peer_sourcehash.c 31 Jan 2002 13:58:00 -0000 1.1.2.3 +++ peer_sourcehash.c 16 Jun 2002 16:34:57 -0000 @@ -60,7 +60,7 @@ char *t; /* Clean up */ for (k = 0; k < n_sourcehash_peers; k++) { - cbdataUnlock(sourcehash_peers[k]); + cbdataReferenceDone(sourcehash_peers[k]); } safe_free(sourcehash_peers); n_sourcehash_peers = 0; @@ -94,8 +94,7 @@ if (floor(p->sourcehash.load_factor * 1000.0) == 0.0) p->sourcehash.load_factor = 0.0; /* add it to our list of peers */ - *P++ = p; - cbdataLock(p); + *P++ = cbdataReference(p); } /* Sort our list on weight */ qsort(sourcehash_peers, n_sourcehash_peers, sizeof(*sourcehash_peers), peerSortWeight);