ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stat_segment.c issue.

Browse Source 
* using default socket name even when overridden in config.

Change-Id: I1849bf5269629873afd1dd48d2df785a491781c3
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-10-20 14:51:14 -07:00
committed by Ole Trøan
parent 8254018c21
commit 95b1b10e54
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vpp/stats/stat_segment.c
View File

@ -553,9 +553,11 @@ stats_segment_socket_init (void)
clib_error_t *error; clib_error_t *error;
clib_socket_t *s = clib_mem_alloc (sizeof (clib_socket_t)); clib_socket_t *s = clib_mem_alloc (sizeof (clib_socket_t));
memset (s, 0, sizeof (clib_socket_t));
s->config = (char *) sm->socket_name; s->config = (char *) sm->socket_name;
s->flags = CLIB_SOCKET_F_IS_SERVER | CLIB_SOCKET_F_SEQPACKET | s->flags = CLIB_SOCKET_F_IS_SERVER | CLIB_SOCKET_F_SEQPACKET |
CLIB_SOCKET_F_ALLOW_GROUP_WRITE | CLIB_SOCKET_F_PASSCRED; CLIB_SOCKET_F_ALLOW_GROUP_WRITE | CLIB_SOCKET_F_PASSCRED;
if ((error = clib_socket_init (s))) if ((error = clib_socket_init (s)))
{ {
clib_error_report (error); clib_error_report (error);
@ -565,8 +567,7 @@ stats_segment_socket_init (void)
clib_file_t template = { 0 }; clib_file_t template = { 0 };
template.read_function = stats_socket_accept_ready; template.read_function = stats_socket_accept_ready;
template.file_descriptor = s->fd; template.file_descriptor = s->fd;
template.description = template.description = format (0, "stats segment listener %s", s->config);
format (0, "stats segment listener %s", STAT_SEGMENT_SOCKET_FILE);
clib_file_add (&file_main, &template); clib_file_add (&file_main, &template);
sm->socket = s; sm->socket = s;
@ -595,6 +596,7 @@ statseg_init (vlib_main_t * vm)
stat_segment_main_t *sm = &stat_segment_main; stat_segment_main_t *sm = &stat_segment_main;
clib_error_t *error; clib_error_t *error;
/* dependent on unix_input_init */
if ((error = vlib_call_init_function (vm, unix_input_init))) if ((error = vlib_call_init_function (vm, unix_input_init)))
return error; return error;
@ -627,7 +629,6 @@ statseg_config (vlib_main_t * vm, unformat_input_t * input)
return clib_error_return (0, "unknown input `%U'", return clib_error_return (0, "unknown input `%U'",
format_unformat_error, input); format_unformat_error, input);
} }
return 0; return 0;
} }
@ -637,8 +638,10 @@ VLIB_EARLY_CONFIG_FUNCTION (statseg_config, "statseg");
/* *INDENT-OFF* */ /* *INDENT-OFF* */
VLIB_REGISTER_NODE (stat_segment_collector, static) = VLIB_REGISTER_NODE (stat_segment_collector, static) =
{ {
.function = stat_segment_collector_process,.name = .function = stat_segment_collector_process,
"statseg-collector-process",.type = VLIB_NODE_TYPE_PROCESS,}; .name = "statseg-collector-process",
.type = VLIB_NODE_TYPE_PROCESS,
};
/* *INDENT-ON* */ /* *INDENT-ON* */