r549 - in trunk/varnish-cache: bin/varnishd include
phk at projects.linpro.no
phk at projects.linpro.no
Fri Jul 21 23:01:45 CEST 2006
Author: phk
Date: 2006-07-21 23:01:45 +0200 (Fri, 21 Jul 2006)
New Revision: 549
Modified:
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/include/vrt.h
Log:
Update VRT to minimal functional level again
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2006-07-21 20:51:24 UTC (rev 548)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2006-07-21 21:01:45 UTC (rev 549)
@@ -11,6 +11,7 @@
#include "shmlog.h"
#include "vrt.h"
+#include "vrt_obj.h"
#include "vcl.h"
#include "cache.h"
@@ -74,32 +75,34 @@
sp->handling = hand;
}
-int
-VRT_obj_valid(struct sess *sp)
+/*--------------------------------------------------------------------*/
+
+void
+VRT_l_backend_host(struct backend *be, const char *h)
{
- CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
- return (sp->obj->valid);
+ CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+ be->hostname = h;
}
-int
-VRT_obj_cacheable(struct sess *sp)
+const char *
+VRT_r_backend_host(struct backend *be)
{
- CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
- return (sp->obj->cacheable);
+ CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+ return (be->hostname);
}
void
-VRT_set_backend_hostname(struct backend *be, const char *h)
+VRT_l_backend_port(struct backend *be, const char *p)
{
CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
- be->hostname = h;
+ be->portname = p;
}
-void
-VRT_set_backend_portname(struct backend *be, const char *p)
+const char *
+VRT_r_backend_port(struct backend *be)
{
CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
- be->portname = p;
+ return (be->portname);
}
void
@@ -122,3 +125,59 @@
cp->backend[i]->magic = BACKEND_MAGIC;
}
}
+
+/*--------------------------------------------------------------------*/
+
+void
+VRT_l_obj_ttl(struct sess *sp, double a)
+{
+
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ (void)a;
+}
+
+double
+VRT_r_obj_ttl(struct sess *sp)
+{
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); /* XXX */
+ return (sp->obj->ttl - sp->t_req);
+}
+
+
+double
+VRT_r_obj_valid(struct sess *sp)
+{
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); /* XXX */
+ return (sp->obj->valid);
+}
+
+
+double
+VRT_r_obj_cacheable(struct sess *sp)
+{
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); /* XXX */
+ return (sp->obj->cacheable);
+}
+
+/*--------------------------------------------------------------------*/
+
+const char *
+VRT_r_req_request(struct sess *sp)
+{
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
+ return (sp->http->hd[HTTP_HDR_REQ].b);
+}
+
+
+const char *
+VRT_r_req_url(struct sess *sp)
+{
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
+ return (sp->http->hd[HTTP_HDR_URL].b);
+}
+
Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h 2006-07-21 20:51:24 UTC (rev 548)
+++ trunk/varnish-cache/include/vrt.h 2006-07-21 21:01:45 UTC (rev 549)
@@ -24,8 +24,6 @@
};
void VRT_count(struct sess *, unsigned);
-void VRT_no_cache(struct sess *);
-void VRT_no_new_cache(struct sess *);
#if 0
int ip_match(unsigned, struct vcl_acl *);
int string_match(const char *, const char *);
@@ -35,14 +33,9 @@
int VRT_switch_config(const char *);
char *VRT_GetHdr(struct sess *, const char *);
-char *VRT_GetReq(struct sess *);
void VRT_handling(struct sess *sp, unsigned hand);
-int VRT_obj_valid(struct sess *);
-int VRT_obj_cacheable(struct sess *);
void VRT_set_backend_name(struct backend *, const char *);
-void VRT_set_backend_hostname(struct backend *, const char *);
-void VRT_set_backend_portname(struct backend *, const char *);
void VRT_alloc_backends(struct VCL_conf *cp);
More information about the varnish-commit
mailing list