cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

vty: sub-divide talloc contexts and include them in talloc report 

The VTY code makes so many allocations that a full report is
simply too long to provide any useful information.  So we sub-divide
it in multiple contexts, and report only one level deep at SIGURS1.

We also introduce SIGUSR2 for the full detailed VTY report.
This commit is contained in:
Harald Welte 2009-12-24 10:51:56 +01:00
parent 28f811c87f
commit 3cefa9aaa0
6 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/vty/command.h
View File

@ -356,4 +356,6 @@ void host_config_set(const char *);
void print_version(const char *); void print_version(const char *);
extern void *tall_vty_cmd_ctx;
#endif /* _ZEBRA_COMMAND_H */ #endif /* _ZEBRA_COMMAND_H */

2
openbsc/include/vty/vector.h
View File

@ -59,4 +59,6 @@ vector vector_copy(vector v);
void *vector_lookup(vector, unsigned int); void *vector_lookup(vector, unsigned int);
void *vector_lookup_ensure(vector, unsigned int); void *vector_lookup_ensure(vector, unsigned int);
extern void *tall_vty_vec_ctx;
#endif /* _ZEBRA_VECTOR_H */ #endif /* _ZEBRA_VECTOR_H */

6
openbsc/src/bsc_hack.c
View File

@ -138,6 +138,7 @@ static void handle_options(int argc, char** argv)
} }
} }
extern void *tall_vty_ctx;
static void signal_handler(int signal) static void signal_handler(int signal)
{ {
fprintf(stdout, "signal %u received\n", signal); fprintf(stdout, "signal %u received\n", signal);
@ -153,8 +154,12 @@ static void signal_handler(int signal)
/* in case of abort, we want to obtain a talloc report /* in case of abort, we want to obtain a talloc report
* and then return to the caller, who will abort the process */ * and then return to the caller, who will abort the process */
case SIGUSR1: case SIGUSR1:
talloc_report(tall_vty_ctx, stderr);
talloc_report_full(tall_bsc_ctx, stderr); talloc_report_full(tall_bsc_ctx, stderr);
break; break;
case SIGUSR2:
talloc_report_full(tall_vty_ctx, stderr);
break;
default: default:
break; break;
} }
@ -219,6 +224,7 @@ int main(int argc, char **argv)
signal(SIGINT, &signal_handler); signal(SIGINT, &signal_handler);
signal(SIGABRT, &signal_handler); signal(SIGABRT, &signal_handler);
signal(SIGUSR1, &signal_handler); signal(SIGUSR1, &signal_handler);
signal(SIGUSR2, &signal_handler);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
while (1) { while (1) {

44
openbsc/src/vty/command.c
View File

@ -49,6 +49,8 @@ Boston, MA 02111-1307, USA. */
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/talloc.h> #include <openbsc/talloc.h>
void *tall_vty_cmd_ctx;
/* Command vector which includes some level of command lists. Normally /* Command vector which includes some level of command lists. Normally
each daemon maintains each own cmdvec. */ each daemon maintains each own cmdvec. */
vector cmdvec; vector cmdvec;
@ -173,7 +175,7 @@ char *argv_concat(const char **argv, int argc, int shift)
len += strlen(argv[i]) + 1; len += strlen(argv[i]) + 1;
if (!len) if (!len)
return NULL; return NULL;
p = str = _talloc_zero(tall_vty_ctx, len, "arvg_concat"); p = str = _talloc_zero(tall_vty_cmd_ctx, len, "arvg_concat");
for (i = shift; i < argc; i++) { for (i = shift; i < argc; i++) {
size_t arglen; size_t arglen;
memcpy(p, argv[i], (arglen = strlen(argv[i]))); memcpy(p, argv[i], (arglen = strlen(argv[i])));
@ -275,7 +277,7 @@ vector cmd_make_strvec(const char *string)
*cp != '\0') *cp != '\0')
cp++; cp++;
strlen = cp - start; strlen = cp - start;
token = _talloc_zero(tall_vty_ctx, strlen + 1, "make_strvec"); token = _talloc_zero(tall_vty_cmd_ctx, strlen + 1, "make_strvec");
memcpy(token, start, strlen); memcpy(token, start, strlen);
*(token + strlen) = '\0'; *(token + strlen) = '\0';
vector_set(strvec, token); vector_set(strvec, token);
@ -331,7 +333,7 @@ static char *cmd_desc_str(const char **string)
cp++; cp++;
strlen = cp - start; strlen = cp - start;
token = _talloc_zero(tall_vty_ctx, strlen + 1, "cmd_desc_str"); token = _talloc_zero(tall_vty_cmd_ctx, strlen + 1, "cmd_desc_str");
memcpy(token, start, strlen); memcpy(token, start, strlen);
*(token + strlen) = '\0'; *(token + strlen) = '\0';
@ -402,11 +404,11 @@ static vector cmd_make_descvec(const char *string, const char *descstr)
len = cp - sp; len = cp - sp;
token = _talloc_zero(tall_vty_ctx, len + 1, "cmd_make_descvec"); token = _talloc_zero(tall_vty_cmd_ctx, len + 1, "cmd_make_descvec");
memcpy(token, sp, len); memcpy(token, sp, len);
*(token + len) = '\0'; *(token + len) = '\0';
desc = talloc_zero(tall_vty_ctx, struct desc); desc = talloc_zero(tall_vty_cmd_ctx, struct desc);
desc->cmd = token; desc->cmd = token;
desc->str = cmd_desc_str(&dp); desc->str = cmd_desc_str(&dp);
@ -1804,7 +1806,7 @@ static char **cmd_complete_command_real(vector vline, struct vty *vty,
if ((desc = vector_slot(descvec, j))) { if ((desc = vector_slot(descvec, j))) {
if ((string = cmd_entry_function(vector_slot(vline, index), desc->cmd))) if ((string = cmd_entry_function(vector_slot(vline, index), desc->cmd)))
if (cmd_unique_string (matchvec, string)) if (cmd_unique_string (matchvec, string))
vector_set (matchvec, talloc_strdup(tall_vty_ctx, string)); vector_set (matchvec, talloc_strdup(tall_vty_cmd_ctx, string));
} }
} }
} }
@ -1845,7 +1847,7 @@ static char **cmd_complete_command_real(vector vline, struct vty *vty,
if (len < lcd) { if (len < lcd) {
char *lcdstr; char *lcdstr;
lcdstr = _talloc_zero(tall_vty_ctx, lcd + 1, lcdstr = _talloc_zero(tall_vty_cmd_ctx, lcd + 1,
"complete-lcdstr"); "complete-lcdstr");
memcpy(lcdstr, matchvec->index[0], lcd); memcpy(lcdstr, matchvec->index[0], lcd);
lcdstr[lcd] = '\0'; lcdstr[lcd] = '\0';
@ -2463,13 +2465,13 @@ DEFUN(config_write_file,
config_file = host.config; config_file = host.config;
config_file_sav = config_file_sav =
_talloc_zero(tall_vty_ctx, _talloc_zero(tall_vty_cmd_ctx,
strlen(config_file) + strlen(CONF_BACKUP_EXT) + 1, strlen(config_file) + strlen(CONF_BACKUP_EXT) + 1,
"config_file_sav"); "config_file_sav");
strcpy(config_file_sav, config_file); strcpy(config_file_sav, config_file);
strcat(config_file_sav, CONF_BACKUP_EXT); strcat(config_file_sav, CONF_BACKUP_EXT);
config_file_tmp = _talloc_zero(tall_vty_ctx, strlen(config_file) + 8, config_file_tmp = _talloc_zero(tall_vty_cmd_ctx, strlen(config_file) + 8,
"config_file_tmp"); "config_file_tmp");
sprintf(config_file_tmp, "%s.XXXXXX", config_file); sprintf(config_file_tmp, "%s.XXXXXX", config_file);
@ -2650,7 +2652,7 @@ DEFUN(config_hostname,
if (host.name) if (host.name)
talloc_free(host.name); talloc_free(host.name);
host.name = talloc_strdup(tall_vty_ctx, argv[0]); host.name = talloc_strdup(tall_vty_cmd_ctx, argv[0]);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2685,7 +2687,7 @@ DEFUN(config_password, password_cmd,
host.password = NULL; host.password = NULL;
if (host.password_encrypt) if (host.password_encrypt)
talloc_free(host.password_encrypt); talloc_free(host.password_encrypt);
host.password_encrypt = talloc_strdup(tall_vty_ctx, argv[1]); host.password_encrypt = talloc_strdup(tall_vty_cmd_ctx, argv[1]);
return CMD_SUCCESS; return CMD_SUCCESS;
} else { } else {
vty_out(vty, "Unknown encryption type.%s", VTY_NEWLINE); vty_out(vty, "Unknown encryption type.%s", VTY_NEWLINE);
@ -2708,10 +2710,10 @@ DEFUN(config_password, password_cmd,
if (host.encrypt) { if (host.encrypt) {
if (host.password_encrypt) if (host.password_encrypt)
talloc_free(host.password_encrypt); talloc_free(host.password_encrypt);
host.password_encrypt = talloc_strdup(tall_vty_ctx, zencrypt(argv[0])); host.password_encrypt = talloc_strdup(tall_vty_cmd_ctx, zencrypt(argv[0]));
} else } else
#endif #endif
host.password = talloc_strdup(tall_vty_ctx, argv[0]); host.password = talloc_strdup(tall_vty_cmd_ctx, argv[0]);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2744,7 +2746,7 @@ ALIAS(config_password, password_text_cmd,
if (host.enable_encrypt) if (host.enable_encrypt)
talloc_free(host.enable_encrypt); talloc_free(host.enable_encrypt);
host.enable_encrypt = talloc_strdup(tall_vty_ctx, argv[1]); host.enable_encrypt = talloc_strdup(tall_vty_cmd_ctx, argv[1]);
return CMD_SUCCESS; return CMD_SUCCESS;
} else { } else {
@ -2769,10 +2771,10 @@ ALIAS(config_password, password_text_cmd,
if (host.encrypt) { if (host.encrypt) {
if (host.enable_encrypt) if (host.enable_encrypt)
talloc_free(host.enable_encrypt); talloc_free(host.enable_encrypt);
host.enable_encrypt = talloc_strdup(tall_vty_ctx, zencrypt(argv[0])); host.enable_encrypt = talloc_strdup(tall_vty_cmd_ctx, zencrypt(argv[0]));
} else } else
#endif #endif
host.enable = talloc_strdup(tall_vty_ctx, argv[0]); host.enable = talloc_strdup(tall_vty_cmd_ctx, argv[0]);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2816,12 +2818,12 @@ DEFUN(service_password_encrypt,
if (host.password) { if (host.password) {
if (host.password_encrypt) if (host.password_encrypt)
talloc_free(host.password_encrypt); talloc_free(host.password_encrypt);
host.password_encrypt = talloc_strdup(tall_vty_ctx, zencrypt(host.password)); host.password_encrypt = talloc_strdup(tall_vty_cmd_ctx, zencrypt(host.password));
} }
if (host.enable) { if (host.enable) {
if (host.enable_encrypt) if (host.enable_encrypt)
talloc_free(host.enable_encrypt); talloc_free(host.enable_encrypt);
host.enable_encrypt = talloc_strdup(tall_vty_ctx, zencrypt(host.enable)); host.enable_encrypt = talloc_strdup(tall_vty_cmd_ctx, zencrypt(host.enable));
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -3095,7 +3097,7 @@ static int set_log_file(struct vty *vty, const char *fname, int loglevel)
if (host.logfile) if (host.logfile)
talloc_free(host.logfile); talloc_free(host.logfile);
host.logfile = talloc_strdup(tall_vty_ctx, fname); host.logfile = talloc_strdup(tall_vty_cmd_ctx, fname);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -3285,7 +3287,7 @@ DEFUN(banner_motd_file,
{ {
if (host.motdfile) if (host.motdfile)
talloc_free(host.motdfile); talloc_free(host.motdfile);
host.motdfile = talloc_strdup(tall_vty_ctx, argv[0]); host.motdfile = talloc_strdup(tall_vty_cmd_ctx, argv[0]);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -3313,7 +3315,7 @@ DEFUN(no_banner_motd,
/* Set config filename. Called from vty.c */ /* Set config filename. Called from vty.c */
void host_config_set(const char *filename) void host_config_set(const char *filename)
{ {
host.config = talloc_strdup(tall_vty_ctx, filename); host.config = talloc_strdup(tall_vty_cmd_ctx, filename);
} }
void install_default(enum node_type node) void install_default(enum node_type node)

12
openbsc/src/vty/vector.c
View File

@ -27,10 +27,12 @@
#include <openbsc/talloc.h> #include <openbsc/talloc.h>
#include <memory.h> #include <memory.h>
void *tall_vty_vec_ctx;
/* Initialize vector : allocate memory and return vector. */ /* Initialize vector : allocate memory and return vector. */
vector vector_init(unsigned int size) vector vector_init(unsigned int size)
{ {
vector v = talloc_zero(tall_vty_ctx, struct _vector); vector v = talloc_zero(tall_vty_vec_ctx, struct _vector);
if (!v) if (!v)
return NULL; return NULL;
@ -40,7 +42,7 @@ vector vector_init(unsigned int size)
v->alloced = size; v->alloced = size;
v->active = 0; v->active = 0;
v->index = _talloc_zero(tall_vty_ctx, sizeof(void *) * size, v->index = _talloc_zero(tall_vty_vec_ctx, sizeof(void *) * size,
"vector_init:index"); "vector_init:index");
if (!v->index) { if (!v->index) {
talloc_free(v); talloc_free(v);
@ -68,7 +70,7 @@ void vector_free(vector v)
vector vector_copy(vector v) vector vector_copy(vector v)
{ {
unsigned int size; unsigned int size;
vector new = talloc_zero(tall_vty_ctx, struct _vector); vector new = talloc_zero(tall_vty_vec_ctx, struct _vector);
if (!new) if (!new)
return NULL; return NULL;
@ -76,7 +78,7 @@ vector vector_copy(vector v)
new->alloced = v->alloced; new->alloced = v->alloced;
size = sizeof(void *) * (v->alloced); size = sizeof(void *) * (v->alloced);
new->index = _talloc_zero(tall_vty_ctx, size, "vector_copy:index"); new->index = _talloc_zero(tall_vty_vec_ctx, size, "vector_copy:index");
if (!new->index) { if (!new->index) {
talloc_free(new); talloc_free(new);
return NULL; return NULL;
@ -92,7 +94,7 @@ void vector_ensure(vector v, unsigned int num)
if (v->alloced > num) if (v->alloced > num)
return; return;
v->index = talloc_realloc_size(tall_vty_ctx, v->index, v->index = talloc_realloc_size(tall_vty_vec_ctx, v->index,
sizeof(void *) * (v->alloced * 2)); sizeof(void *) * (v->alloced * 2));
memset(&v->index[v->alloced], 0, sizeof(void *) * v->alloced); memset(&v->index[v->alloced], 0, sizeof(void *) * v->alloced);
v->alloced *= 2; v->alloced *= 2;

2
openbsc/src/vty/vty.c
View File

@ -1633,6 +1633,8 @@ extern void *tall_bsc_ctx;
void vty_init() void vty_init()
{ {
tall_vty_ctx = talloc_named_const(NULL, 0, "vty"); tall_vty_ctx = talloc_named_const(NULL, 0, "vty");
tall_vty_vec_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_vector");
tall_vty_cmd_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_command");
/* For further configuration read, preserve current directory. */ /* For further configuration read, preserve current directory. */
vty_save_cwd(); vty_save_cwd();