diff options
Diffstat (limited to 'openbsc')
-rw-r--r-- | openbsc/include/openbsc/e1_input.h | 10 | ||||
-rw-r--r-- | openbsc/src/libabis/e1_input.c | 35 | ||||
-rw-r--r-- | openbsc/src/libabis/e1_input_vty.c | 33 |
3 files changed, 66 insertions, 12 deletions
diff --git a/openbsc/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h index 0d79c7d1e..f201c4fb1 100644 --- a/openbsc/include/openbsc/e1_input.h +++ b/openbsc/include/openbsc/e1_input.h @@ -8,6 +8,7 @@ #include <openbsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/subchan_demux.h> #define NUM_E1_TS 32 @@ -19,6 +20,14 @@ enum e1inp_sign_type { }; const char *e1inp_signtype_name(enum e1inp_sign_type tp); +enum e1inp_ctr { + E1I_CTR_HDLC_ABORT, + E1I_CTR_HDLC_BADFCS, + E1I_CTR_HDLC_OVERR, + E1I_CTR_ALARM, + E1I_CTR_REMOVED, +}; + struct e1inp_ts; struct e1inp_sign_link { @@ -107,6 +116,7 @@ struct e1inp_line { struct llist_head list; unsigned int num; const char *name; + struct rate_ctr_group *rate_ctr; /* array of timestlots */ struct e1inp_ts ts[NUM_E1_TS]; diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c index 293175e5f..f73862673 100644 --- a/openbsc/src/libabis/e1_input.c +++ b/openbsc/src/libabis/e1_input.c @@ -39,17 +39,19 @@ #endif #include <osmocom/core/select.h> +#include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> + #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> -#include <osmocom/core/linuxlist.h> #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/trau_mux.h> -#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/misdn.h> @@ -65,6 +67,31 @@ LLIST_HEAD(e1inp_line_list); static void *tall_sigl_ctx; +static const struct rate_ctr_desc e1inp_ctr_d[] = { + [E1I_CTR_HDLC_ABORT] = { + "hdlc.abort", "ABORT from E1 Layer1" + }, + [E1I_CTR_HDLC_BADFCS] = { + "hdlc.bad_fcs", "Bad Frame Check Sequence" + }, + [E1I_CTR_HDLC_OVERR] = { + "hdlc.overrun", "HDLC Overrun" + }, + [E1I_CTR_ALARM] = { + "alarm", "E1 Alarm (Yellow/Red)" + }, + [E1I_CTR_REMOVED] = { + "removed", "E1 Line removed" + }, +}; + +static const struct rate_ctr_group_desc e1inp_ctr_g_d = { + .group_name_prefix = "e1inp", + .group_description = "E1 Input subsystem", + .num_ctr = ARRAY_SIZE(e1inp_ctr_d), + .ctr_desc = e1inp_ctr_d, +}; + /* * pcap writing of the misdn load * pcap format is from http://wiki.wireshark.org/Development/LibpcapFileFormat @@ -360,8 +387,10 @@ struct e1inp_line *e1inp_line_create(uint8_t e1_nr, const char *driver_name) return NULL; line->driver = driver; - line->num = e1_nr; + + line->rate_ctr = rate_ctr_group_alloc(line, &e1inp_ctr_g_d, line->num); + for (i = 0; i < NUM_E1_TS; i++) { line->ts[i].num = i+1; line->ts[i].line = line; diff --git a/openbsc/src/libabis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c index 6055038f3..eb34aa188 100644 --- a/openbsc/src/libabis/e1_input_vty.c +++ b/openbsc/src/libabis/e1_input_vty.c @@ -20,23 +20,27 @@ #include <stdlib.h> #include <unistd.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> + #include <osmocom/vty/command.h> #include <osmocom/vty/buffer.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/logging.h> +#include <osmocom/vty/misc.h> #include <osmocom/vty/telnet_interface.h> -#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> -#include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm_utils.h> -#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/debug.h> #include "../../bscconfig.h" +/* CONFIG */ + #define E1_DRIVER_NAMES "(misdn|dahdi)" #define E1_DRIVER_HELP "mISDN supported E1 Card\n" \ "DAHDI supported E1/T1/J1 Card\n" @@ -114,6 +118,8 @@ static int e1inp_config_write(struct vty *vty) return CMD_SUCCESS; } +/* SHOW */ + static void e1drv_dump_vty(struct vty *vty, struct e1inp_driver *drv) { vty_out(vty, "E1 Input Driver %s%s", drv->name, VTY_NEWLINE); @@ -132,34 +138,43 @@ DEFUN(show_e1drv, return CMD_SUCCESS; } -static void e1line_dump_vty(struct vty *vty, struct e1inp_line *line) +static void e1line_dump_vty(struct vty *vty, struct e1inp_line *line, + int stats) { vty_out(vty, "E1 Line Number %u, Name %s, Driver %s%s", line->num, line->name ? line->name : "", line->driver->name, VTY_NEWLINE); + if (stats) + vty_out_rate_ctr_group(vty, " ", line->rate_ctr); } DEFUN(show_e1line, show_e1line_cmd, - "show e1_line [line_nr]", + "show e1_line [line_nr] [stats]", SHOW_STR "Display information about a E1 line\n" "E1 Line Number\n") { struct e1inp_line *line; + int stats = 0; - if (argc >= 1) { + if (argc >= 1 && strcmp(argv[0], "stats")) { int num = atoi(argv[0]); + if (argc >= 2) + stats = 1; llist_for_each_entry(line, &e1inp_line_list, list) { if (line->num == num) { - e1line_dump_vty(vty, line); + e1line_dump_vty(vty, line, stats); return CMD_SUCCESS; } } return CMD_WARNING; } + if (argc >= 1 && !strcmp(argv[0], "stats")) + stats = 1; + llist_for_each_entry(line, &e1inp_line_list, list) - e1line_dump_vty(vty, line); + e1line_dump_vty(vty, line, stats); return CMD_SUCCESS; } |