Remove the -L option stuff, it will not be needed for docs.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4954 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/mgt_vcc.c

@@ -336,15 +336,7 @@ mgt_vcc_default(const char *b_arg, const char *f_arg, char *vcl, int C_flag)
 	/* XXX: annotate vcl with -b/-f arg so people know where it came from */
 	(void)f_arg;
 
-	if (L_arg && b_arg == NULL) {
-		bprintf(buf,
-		    "backend default {\n"
-		    "    .host = \"127.0.0.1\";\n"
-		    "    .port = %s;\n"
-		    "}\n", "Learn(0)");
-		vcl = strdup(buf);
-		AN(vcl);
-	} else if (b_arg != NULL) {
+	if (b_arg != NULL) {
 		AZ(vcl);
 		/*
 		 * XXX: should do a "HEAD /" on the -b argument to see that
@@ -456,7 +448,7 @@ void
 mgt_vcc_init(void)
 {
 
-	VCC_InitCompile(default_vcl, L_arg);
+	VCC_InitCompile(default_vcl);
 	AZ(atexit(mgt_vcc_atexit));
 }
 

bin/varnishd/varnishd.c

@@ -84,7 +84,6 @@ pid_t			mgt_pid;
 struct vev_base		*mgt_evb;
 int			exit_status = 0;
 struct vsb		*vident;
-unsigned		L_arg = 0;
 
 static void
 build_vident(void)
@@ -365,7 +364,6 @@ main(int argc, char * const *argv)
 	struct cli cli[1];
 	struct pidfh *pfh = NULL;
 	char *dirname;
-	char tmpbuf[128];
 
 	/*
 	 * Start out by closing all unwanted file descriptors we might
@@ -459,20 +457,6 @@ main(int argc, char * const *argv)
 			break;
 		case 'l':
 			l_arg = optarg;
-			break;
-		case 'L':
-			L_arg = strtoul(optarg, NULL, 0);
-			if (!VIN_L_OK(L_arg)) {
-				fprintf(stderr, "%s\n", VIN_L_MSG);
-				exit (1);
-			}
-			d_flag++;
-			n_arg = vin_L_arg(L_arg);
-			MCF_ParamSet(cli, "ping_interval", "0");
-
-			bprintf(tmpbuf, "127.0.0.1:%u", L_arg);
-			MCF_ParamSet(cli, "listen_address", tmpbuf);
-
 			break;
 		case 'M':
 			M_arg = optarg;
@@ -532,14 +516,6 @@ main(int argc, char * const *argv)
 
 	mgt_vcc_init();
 
-	if (L_arg) {
-		/* Learner mode */
-		if (!s_arg_given) {
-			STV_config("malloc,1m");
-			s_arg_given = 1;
-		}
-	}
-
 	if (argc != 0) {
 		fprintf(stderr, "Too many arguments (%s...)\n", argv[0]);
 		usage();
@@ -611,7 +587,7 @@ main(int argc, char * const *argv)
 		exit(1);
 	}
 
-	if (b_arg != NULL || f_arg != NULL || L_arg > 0)
+	if (b_arg != NULL || f_arg != NULL)
 		if (mgt_vcc_default(b_arg, f_arg, vcl, C_flag))
 			exit (2);
 
@@ -654,10 +630,6 @@ main(int argc, char * const *argv)
 		mgt_cli_master(M_arg);
 	if (T_arg != NULL)
 		mgt_cli_telnet(T_arg);
-	else if (L_arg > 0) {
-		bprintf(tmpbuf, "127.0.0.1:%u", L_arg + 1);
-		mgt_cli_telnet(tmpbuf);
-	}
 
 	STV_ready();	/* Complete initialization */
 

bin/varnishstat/varnishstat.c

@@ -206,9 +206,6 @@ main(int argc, char * const *argv)
 		case '1':
 			once = 1;
 			break;
-		case 'f':
-			(void)VSC_Arg(vd, c, optarg);
-			break;
 		case 'l':
 			if (VSC_Open(vd, 1))
 				exit(1);

bin/varnishtest/vtc.c

@@ -64,8 +64,6 @@ static struct vtclog	*vltop;
 static pthread_mutex_t	vtc_mtx;
 static pthread_cond_t	vtc_cond;
 
-int			vtc_learn = 0;
-
 /**********************************************************************
  * Macro facility
  */
@@ -119,11 +117,9 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
 		va_end(ap);
 		m->val = strdup(buf2);
 		AN(m->val);
-		if (!vtc_learn)
-			vtc_log(vl, 4, "macro def %s=%s", name, m->val);
+		vtc_log(vl, 4, "macro def %s=%s", name, m->val);
 	} else if (m != NULL) {
-		if (!vtc_learn)
-			vtc_log(vl, 4, "macro undef %s", name);
+		vtc_log(vl, 4, "macro undef %s", name);
 		VTAILQ_REMOVE(&macro_list, m, list);
 		free(m->name);
 		free(m->val);
@@ -623,17 +619,6 @@ main(int argc, char * const *argv)
 	AN(vltop);
 	while ((ch = getopt(argc, argv, "L:n:qt:v")) != -1) {
 		switch (ch) {
-		case 'L':
-			/* XXX: append "/tutorial" to default search path */
-			vtc_learn = strtoul(optarg, NULL, 0);
-			if (vtc_learn > 65000) {
-				fprintf(stderr,
-				    "-L argument must be 1...65000\n");
-				exit(1);
-			}
-			vtc_verbosity += 2;
-			dur = 60 * 3;	/* seconds */
-			break;
 		case 'n':
 			ntest = strtoul(optarg, NULL, 0);
 			break;

bin/varnishtest/vtc.h

@@ -53,7 +53,6 @@ cmd_f cmd_client;
 cmd_f cmd_varnish;
 cmd_f cmd_sema;
 
-extern int vtc_learn;		/* Non-zero in Learners mode */
 extern int vtc_verbosity;
 extern int vtc_error;		/* Error, bail out */
 extern int vtc_stop;		/* Abandon current test, no error */

bin/varnishtest/vtc_client.c

@@ -136,10 +136,7 @@ client_new(const char *name)
 	if (*c->name != 'c')
 		vtc_log(c->vl, 0, "Client name must start with 'c'");
 
-	if (vtc_learn)
-		bprintf(c->connect, "127.0.0.1:%d", vtc_learn);
-	else
-		bprintf(c->connect, "%s", "${v1_sock}");
+	bprintf(c->connect, "%s", "${v1_sock}");
 	VTAILQ_INSERT_TAIL(&clients, c, list);
 	return (c);
 }
@@ -183,8 +180,7 @@ client_wait(struct client *c)
 	void *res;
 
 	CHECK_OBJ_NOTNULL(c, CLIENT_MAGIC);
-	if (!vtc_learn)
-		vtc_log(c->vl, 2, "Waiting for client");
+	vtc_log(c->vl, 2, "Waiting for client");
 	AZ(pthread_join(c->tp, &res));
 	if (res != NULL)
 		vtc_log(c->vl, 0, "Client returned \"%s\"", (char *)res);
@@ -242,11 +238,7 @@ cmd_client(CMD_ARGS)
 		if (vtc_error)
 			break;
 		if (!strcmp(*av, "-connect")) {
-			if (vtc_learn)
-				bprintf(c->connect, "127.0.0.1:%d",
-				    vtc_learn + atoi(av[1]));
-			else
-				bprintf(c->connect, "%s", av[1]);
+			bprintf(c->connect, "%s", av[1]);
 			av++;
 			continue;
 		}

bin/varnishtest/vtc_http.c

@@ -915,10 +915,7 @@ http_process(struct vtclog *vl, const char *spec, int sock, int sfd)
 	ALLOC_OBJ(hp, HTTP_MAGIC);
 	AN(hp);
 	hp->fd = sock;
-	if (vtc_learn)
-		hp->timeout = 120 * 1000;
-	else
-		hp->timeout = 3000;
+	hp->timeout = 3000;
 	hp->nrxbuf = 640*1024;
 	hp->vsb = vsb_newauto();
 	hp->rxbuf = malloc(hp->nrxbuf);		/* XXX */

bin/varnishtest/vtc_server.c

@@ -137,10 +137,7 @@ server_new(const char *name)
 	if (*s->name != 's')
 		vtc_log(s->vl, 0, "Server name must start with 's'");
 
-	if (vtc_learn)
-		bprintf(s->listen, "127.0.0.1:%d", vtc_learn + 10);
-	else
-		bprintf(s->listen, "127.0.0.1:%d", 0);
+	bprintf(s->listen, "127.0.0.1:%d", 0);
 	AZ(VSS_parse(s->listen, &s->addr, &s->port));
 	s->repeat = 1;
 	s->depth = 1;
@@ -174,8 +171,7 @@ server_start(struct server *s)
 	int naddr;
 
 	CHECK_OBJ_NOTNULL(s, SERVER_MAGIC);
-	if (!vtc_learn)
-		vtc_log(s->vl, 2, "Starting server");
+	vtc_log(s->vl, 2, "Starting server");
 	if (s->sock < 0) {
 		naddr = VSS_resolve(s->addr, s->port, &s->vss_addr);
 		if (naddr != 1)
@@ -194,8 +190,7 @@ server_start(struct server *s)
 		if (!strcmp(s->port, "0"))
 			REPLACE(s->port, s->aport);
 	}
-	if (!vtc_learn)
-		vtc_log(s->vl, 1, "Listen on %s:%s", s->addr, s->port);
+	vtc_log(s->vl, 1, "Listen on %s:%s", s->addr, s->port);
 	s->run = 1;
 	AZ(pthread_create(&s->tp, NULL, server_thread, s));
 }
@@ -210,8 +205,7 @@ server_wait(struct server *s)
 	void *res;
 
 	CHECK_OBJ_NOTNULL(s, SERVER_MAGIC);
-	if (!vtc_learn)
-		vtc_log(s->vl, 2, "Waiting for server");
+	vtc_log(s->vl, 2, "Waiting for server");
 	AZ(pthread_join(s->tp, &res));
 	if (res != NULL && !vtc_stop)
 		vtc_log(s->vl, 0, "Server returned \"%p\"",
@@ -300,11 +294,7 @@ cmd_server(CMD_ARGS)
 			continue;
 		}
 		if (!strcmp(*av, "-listen")) {
-			if (vtc_learn)
-				bprintf(s->listen, "127.0.0.1:%d",
-				    vtc_learn + 10 + atoi(av[1]));
-			else
-				bprintf(s->listen, "%s", av[1]);
+			bprintf(s->listen, "%s", av[1]);
 			AZ(VSS_parse(s->listen, &s->addr, &s->port));
 			av++;
 			continue;

bin/varnishtest/vtc_varnish.c

@@ -459,7 +459,7 @@ varnish_wait(struct varnish *v)
 	AZ(close(v->cli_fd));
 	v->cli_fd = -1;
 
-	AZ(close(v->fds[1]));
+	(void)close(v->fds[1]);		/* May already have been closed */
 
 	AZ(pthread_join(v->tp, &p));
 	AZ(close(v->fds[0]));

include/libvcl.h

@@ -30,6 +30,6 @@
  */
 
 char *VCC_Compile(struct vsb *sb, const char *b, const char *e);
-void VCC_InitCompile(const char *default_vcl, unsigned L_arg);
+void VCC_InitCompile(const char *default_vcl);
 const char *VCC_Return_Name(unsigned action);
 

include/varnishapi.h

@@ -150,7 +150,7 @@ void VSC_Setup(struct VSM_data *vd);
 	 * Setup vd for use with VSC functions.
 	 */
 
-#define VSC_ARGS	"L:n:"
+#define VSC_ARGS	"f:n:"
 #define VSC_n_USAGE	VSM_n_USAGE
 #define VSC_USAGE	VSC_N_USAGE
 
@@ -210,7 +210,7 @@ int VSL_Open(struct VSM_data *vd, int diag);
 	 * 	!= 0 on failure
 	 */
 	
-#define VSL_ARGS	"bCcdI:i:k:L:n:r:s:X:x:"
+#define VSL_ARGS	"bCcdI:i:k:n:r:s:X:x:"
 #define VSL_b_USAGE	"[-b]"
 #define VSL_c_USAGE	"[-c]"
 #define VSL_C_USAGE	"[-C]"

include/vin.h

@@ -35,10 +35,4 @@
 
 /* This function lives in both libvarnish and libvarnishapi */
 int vin_n_arg(const char *n_arg, char **name, char **dir, char **vsl);
-char *vin_L_arg(unsigned L_arg);
-#define VIN_L_LOW	1024
-#define VIN_L_HIGH	65000
-#define VIN_L_OK(a)	(a >= VIN_L_LOW && a <= VIN_L_HIGH)
-#define VIN_L_MSG	"-L argument must be [1024...65000]"
-
 #endif

lib/libvarnish/vin.c

@@ -101,13 +101,3 @@ vin_n_arg(const char *n_arg, char **name, char **dir, char **vsl)
 	}
 	return (0);
 }
-
-char *
-vin_L_arg(unsigned L_arg)
-{
-	char p[PATH_MAX];
-
-	assert(VIN_L_OK(L_arg));
-	bprintf(p, "/tmp/varnish_L_%u", L_arg);
-	return (strdup(p));
-}

lib/libvarnishapi/vsl_api.h

@@ -46,7 +46,6 @@ struct vsl {
 	unsigned		rbuflen;
 	uint32_t		*rbuf;
 
-	unsigned		L_opt;
 	int			b_opt;
 	int			c_opt;
 	int			d_opt;

lib/libvarnishapi/vsl_arg.c

@@ -210,16 +210,6 @@ VSL_Arg(struct VSM_data *vd, int arg, const char *opt)
 	case 's': return (vsl_s_arg(vd, opt));
 	case 'I': case 'X': return (vsl_IX_arg(vd, opt, arg));
 	case 'C': vd->vsl->regflags = VRE_CASELESS; return (1);
-	case 'L':
-		vd->vsl->L_opt = strtoul(opt, NULL, 0);
-		if (vd->vsl->L_opt < 1024 || vd->vsl->L_opt > 65000) {
-			fprintf(stderr, "%s\n", VIN_L_MSG);
-			exit (1);
-		}
-		free(vd->n_opt);
-		vd->n_opt = vin_L_arg(vd->vsl->L_opt);
-		assert(vd->n_opt != NULL);
-		return (1);
 	default:
 		return (0);
 	}

lib/libvarnishapi/vsm.c

@@ -213,7 +213,8 @@ VSM_Close(struct VSM_data *vd)
 {
 
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
-	AN(vd->vsm_head);
+	if (vd->vsm_head == NULL)
+		return;
 	assert(0 == munmap((void*)vd->vsm_head, vd->vsm_head->shm_size));
 	vd->vsm_head = NULL;
 	assert(vd->vsm_fd >= 0);

lib/libvcl/vcc_backend.c

@@ -393,9 +393,7 @@ vcc_ParseHostDef(struct tokenlist *tl, int serial, const char *vgcname)
 	struct fld_spec *fs;
 	struct vsb *vsb;
 	unsigned u;
-	unsigned tL_port = 0;
 	double t;
-	char tmpbuf[20];
 
 	Fh(tl, 1, "\n#define VGC_backend_%s %d\n", vgcname, tl->ndirector);
 
@@ -449,39 +447,10 @@ vcc_ParseHostDef(struct tokenlist *tl, int serial, const char *vgcname)
 			vcc_NextToken(tl);
 			SkipToken(tl, ';');
 		} else if (vcc_IdIs(t_field, "port")) {
-			if (Learn_mode) {
-				ExpectErr(tl, ID);
-				if (!vcc_IdIs(tl->t, "Learn")) {
-					vsb_printf(tl->sb,
-					    "Expected \"Learn\"\n");
-					vcc_ErrToken(tl, tl->t);
-					vcc_ErrWhere(tl, tl->t);
-					return;
-				}
-				vcc_NextToken(tl);
-
-				ExpectErr(tl, '(');
-				vcc_NextToken(tl);
-
-				ExpectErr(tl, CNUM);
-				t_port = tl->t;
-				tL_port = vcc_UintVal(tl);
-				if (tL_port > 9) {
-					vsb_printf(tl->sb,
-					    "Learn port > 9\n");
-					vcc_ErrToken(tl, t_port);
-					vcc_ErrWhere(tl, t_port);
-					return;
-				}
-
-				ExpectErr(tl, ')');
-				vcc_NextToken(tl);
-			} else {
-				ExpectErr(tl, CSTR);
-				assert(tl->t->dec != NULL);
-				t_port = tl->t;
-				vcc_NextToken(tl);
-			}
+			ExpectErr(tl, CSTR);
+			assert(tl->t->dec != NULL);
+			t_port = tl->t;
+			vcc_NextToken(tl);
 			SkipToken(tl, ';');
 		} else if (vcc_IdIs(t_field, "host_header")) {
 			ExpectErr(tl, CSTR);
@@ -550,10 +519,7 @@ vcc_ParseHostDef(struct tokenlist *tl, int serial, const char *vgcname)
 	}
 
 	/* Check that the portname makes sense */
-	if (Learn_mode && t_port != NULL && t_port->tok == CNUM) {
-		bprintf(tmpbuf, "%u", Learn_mode + 10 + tL_port);
-		Emit_Sockaddr(tl, t_host, tmpbuf);
-	} else if (t_port != NULL) {
+	if (t_port != NULL) {
 		ep = CheckHostPort("127.0.0.1", t_port->dec);
 		if (ep != NULL) {
 			vsb_printf(tl->sb,

lib/libvcl/vcc_compile.c

@@ -86,8 +86,6 @@ struct method method_tab[] = {
 
 static const char *vcc_default_vcl_b, *vcc_default_vcl_e;
 
-unsigned Learn_mode = 0;
-
 /*--------------------------------------------------------------------*/
 
 static void
@@ -675,10 +673,9 @@ VCC_Return_Name(unsigned method)
  */
 
 void
-VCC_InitCompile(const char *default_vcl, unsigned L_arg)
+VCC_InitCompile(const char *default_vcl)
 {
 
-	Learn_mode = L_arg;
 	vcc_default_vcl_b = default_vcl;
 	vcc_default_vcl_e = strchr(default_vcl, '\0');
 	assert(vcc_default_vcl_e != NULL);

lib/libvcl/vcc_compile.h

@@ -163,7 +163,6 @@ void vcc_FieldsOk(struct tokenlist *tl, const struct fld_spec *fs);
 
 /* vcc_compile.c */
 extern struct method method_tab[];
-extern unsigned Learn_mode;
 /*
  * H -> Header, before the C code
  * C -> C-code