Commit 6cbbff0e authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Remove the debug.sizeof CLI hack.

Instead one can start gdb on the compiled binary and ask it:

	print sizeof(struct sess)
	$1 = 192
parent d2ddc9a4
......@@ -35,14 +35,11 @@
#include <execinfo.h>
#endif
#include <stddef.h> // offsetof()
#include <stdlib.h>
#include <signal.h>
#include "cache.h"
#include "cache_filter.h"
#include "hash/hash_slinger.h" // struct objhead
#include "vend.h"
#include "common/heritage.h"
#include "cache_backend.h"
......@@ -50,7 +47,6 @@
#include "vcl.h"
#include "vcli_priv.h"
#include "waiter/waiter.h"
#include "vsa.h"
/*
* The panic string is constructed in memory, then copied to the
......@@ -576,74 +572,6 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
/*--------------------------------------------------------------------*/
static void __match_proto__(cli_func_t)
cli_debug_sizeof(struct cli *cli, const char * const *av, void *priv)
{
(void)av;
AZ(priv);
#define SZOF(foo) VCLI_Out(cli, \
"sizeof(%s) = %zd = 0x%zx\n", #foo, sizeof(foo), sizeof(foo))
SZOF(struct ws);
SZOF(struct http);
SZOF(struct http_conn);
SZOF(struct acct_req);
SZOF(struct worker);
SZOF(struct storage);
SZOF(struct busyobj);
SZOF(struct object);
SZOF(struct objcore);
SZOF(struct objhead);
SZOF(struct sess);
SZOF(struct req);
SZOF(struct vbc);
SZOF(struct VSC_C_main);
SZOF(struct lock);
SZOF(struct dstat);
VCLI_Out(cli, "sizeof(struct suckaddr) = %d = 0x%x\n",
vsa_suckaddr_len, vsa_suckaddr_len);
#if 0
#define OFOF(foo, bar) { foo __foo; VCLI_Out(cli, \
"%-30s = 0x%4zx @ 0x%4zx\n", \
#foo "." #bar, sizeof(__foo.bar), offsetof(foo, bar)); }
#if 0
OFOF(struct objhead, magic);
OFOF(struct objhead, refcnt);
OFOF(struct objhead, mtx);
OFOF(struct objhead, objcs);
OFOF(struct objhead, digest);
OFOF(struct objhead, waitinglist);
OFOF(struct objhead, _u);
#endif
#if 0
OFOF(struct http, magic);
OFOF(struct http, logtag);
OFOF(struct http, ws);
OFOF(struct http, hd);
OFOF(struct http, hdf);
OFOF(struct http, shd);
OFOF(struct http, nhd);
OFOF(struct http, status);
OFOF(struct http, protover);
OFOF(struct http, conds);
#endif
#if 0
OFOF(struct storage, magic);
OFOF(struct storage, fd);
OFOF(struct storage, where);
OFOF(struct storage, list);
OFOF(struct storage, stevedore);
OFOF(struct storage, priv);
OFOF(struct storage, ptr);
OFOF(struct storage, len);
OFOF(struct storage, space);
#endif
#undef OFOF
#endif
}
/*--------------------------------------------------------------------*/
static void __match_proto__(cli_func_t)
ccf_panic(struct cli *cli, const char * const *av, void *priv)
{
......@@ -657,9 +585,6 @@ ccf_panic(struct cli *cli, const char * const *av, void *priv)
/*--------------------------------------------------------------------*/
static struct cli_proto debug_cmds[] = {
{ "debug.sizeof", "debug.sizeof",
"\tDump sizeof various data structures.",
0, 0, "d", cli_debug_sizeof },
{ "debug.panic.worker", "debug.panic.worker",
"\tPanic the worker process.",
0, 0, "d", ccf_panic },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment