r1869 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-08-20 10:57:42 +0200 (Mon, 20 Aug 2007)
New Revision: 1869

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/bin/varnishd/cache_pipe.c
Log:
Use uppercase VBE prefix for VBE_new_bereq() and VBE_free_bereq()


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2007-08-20 08:56:40 UTC (rev 1868)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2007-08-20 08:57:42 UTC (rev 1869)
@@ -366,8 +366,8 @@
 struct vbe_conn *VBE_GetFd(struct sess *sp);
 void VBE_ClosedFd(struct worker *w, struct vbe_conn *vc, int already);
 void VBE_RecycleFd(struct worker *w, struct vbe_conn *vc);
-struct bereq *vbe_new_bereq(void);
-void vbe_free_bereq(struct bereq *bereq);
+struct bereq * VBE_new_bereq(void);
+void VBE_free_bereq(struct bereq *bereq);
 
 /* cache_ban.c */
 void AddBan(const char *, int hash);

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2007-08-20 08:56:40 UTC (rev 1868)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2007-08-20 08:57:42 UTC (rev 1869)
@@ -28,6 +28,12 @@
  *
  * $Id$
  *
+ * NB: This file is in transition:
+ *   In the future it will contain the central part of the backend handling,
+ *   refcounting, functions for DNS lookup and connection revalidation etc.
+ *   The actual policies will be put in separate files, cache_backend_simple.c,
+ *   cache_backend_round_robin.c etc etc.
+ *
  * Manage backend connections.
  *
  * XXX: When we switch VCL we can have vbe_conn's dangling from
@@ -62,7 +68,7 @@
 /*--------------------------------------------------------------------*/
 
 struct bereq *
-vbe_new_bereq(void)
+VBE_new_bereq(void)
 {
 	struct bereq *bereq;
 	volatile unsigned len;
@@ -91,7 +97,7 @@
 /* XXX: no backpressure on pool size */
 
 void
-vbe_free_bereq(struct bereq *bereq)
+VBE_free_bereq(struct bereq *bereq)
 {
 
 	CHECK_OBJ_NOTNULL(bereq, BEREQ_MAGIC);

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-20 08:56:40 UTC (rev 1868)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-20 08:57:42 UTC (rev 1869)
@@ -317,7 +317,7 @@
 	}
 
 
-	vbe_free_bereq(sp->bereq);
+	VBE_free_bereq(sp->bereq);
 	sp->bereq = NULL;
 
 	if (i) {
@@ -590,7 +590,7 @@
 		HSH_Unbusy(sp->obj);
 		HSH_Deref(sp->obj);
 		sp->obj = NULL;
-		vbe_free_bereq(sp->bereq);
+		VBE_free_bereq(sp->bereq);
 		sp->bereq = NULL;
 		sp->step = STP_ERROR;
 		return (0);
@@ -601,7 +601,7 @@
 		HSH_Deref(sp->obj);
 		sp->obj = NULL;
 		sp->step = STP_PASS;
-		vbe_free_bereq(sp->bereq);
+		VBE_free_bereq(sp->bereq);
 		sp->bereq = NULL;
 		return (0);
 	}

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2007-08-20 08:56:40 UTC (rev 1868)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2007-08-20 08:57:42 UTC (rev 1869)
@@ -787,7 +787,7 @@
 	struct http *hp;
 	char *b;
 
-        bereq = vbe_new_bereq();
+        bereq = VBE_new_bereq();
         AN(bereq);
         hp = bereq->http;
         hp->logtag = HTTP_Tx;

Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c	2007-08-20 08:56:40 UTC (rev 1868)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c	2007-08-20 08:57:42 UTC (rev 1869)
@@ -102,7 +102,7 @@
 		return;
 	}
 
-	vbe_free_bereq(bereq);
+	VBE_free_bereq(bereq);
 	bereq = NULL;
 
 	sp->t_resp = TIM_real();