pespin submitted this change.

View Change

Several logging improvements

Improve logging in several places which proved to be usfeful while
analyzing behavior of the program.

Change-Id: I4fa91ca8c8e576094d3a9598df5ad96b230bbde0
---
M src/bankd/bankd_main.c
M src/rspro_client_fsm.c
M src/server/rspro_server.c
3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c
index cd68073..e9e4889 100644
--- a/src/bankd/bankd_main.c
+++ b/src/bankd/bankd_main.c
@@ -420,12 +420,15 @@
 	signal(SIGMAPADD, handle_sig_mapadd);
 	signal(SIGUSR1, handle_sig_usr1);
 
+	LOGP(DMAIN, LOGL_INFO, "Reading PCSC slots...\n");
 	/* Np lock or mutex required for the pcsc_slot_names list, as this is only
 	 * read once during bankd initialization, when the worker threads haven't
 	 * started yet */
 	rc = bankd_pcsc_read_slotnames(g_bankd, "bankd_pcsc_slots.csv");
-	if (rc)
+	if (rc) {
+		fprintf(stderr, "ERROR: failed reading bankd_pcsc_slots.csv file\n");
 		exit(1);
+	}
 
 	/* Connection towards remsim-server */
 	rc = server_conn_fsm_alloc(g_bankd, srvc);
@@ -436,6 +439,8 @@
 	osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL);
 
 	/* create listening socket for inbound client connections */
+	LOGP(DMAIN, LOGL_INFO, "Initiating listen TCP socket at %s:%d\n",
+	     g_bind_ip ? g_bind_ip : "INADDR_ANY", g_bind_port);
 	rc = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, g_bind_ip, g_bind_port, OSMO_SOCK_F_BIND);
 	if (rc < 0) {
 		fprintf(stderr, "Unable to create TCP socket at %s:%d: %s\n",
@@ -446,6 +451,7 @@
 
 	/* initialize gsmtap, if required */
 	if (g_bankd->cfg.gsmtap_host) {
+		LOGP(DMAIN, LOGL_INFO, "Initiating GSMTAP\n");
 		rc = bankd_gsmtap_init(g_bankd->cfg.gsmtap_host);
 		if (rc < 0) {
 			fprintf(stderr, "Unable to open GSMTAP\n");
@@ -456,6 +462,7 @@
 	/* create worker threads: One per reader/slot! */
 	for (i = 0; i < g_bankd->srvc.bankd.num_slots; i++) {
 		struct bankd_worker *w;
+		LOGP(DMAIN, LOGL_INFO, "Initiating worker %d\n", i);
 		w = bankd_create_worker(g_bankd, i);
 		if (!w) {
 			fprintf(stderr, "Error creating bankd worker thread\n");
@@ -463,12 +470,10 @@
 		}
 	}
 
-	while (1) {
-		if (terminate)
-			break;
+	while (!terminate) {
 		osmo_select_main(0);
 	}
-
+	LOGP(DMAIN, LOGL_NOTICE, "Terminated\n");
 	talloc_free(g_bankd);
 	exit(0);
 }
diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c
index 03dbe15..d847f3b 100644
--- a/src/rspro_client_fsm.c
+++ b/src/rspro_client_fsm.c
@@ -502,6 +502,7 @@
 	osmo_stream_cli_destroy(srvc->conn);
 	srvc->conn = NULL;
 err_exit:
+	LOGPFSML(fi, LOGL_FATAL, "exit(1)\n");
 	exit(1);
 }
 
diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c
index 0936238..1cc1af1 100644
--- a/src/server/rspro_server.c
+++ b/src/server/rspro_server.c
@@ -780,6 +780,8 @@
 static int ipa_keepalive_send_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, struct msgb *msg, void *data)
 {
 	struct osmo_stream_srv *srv = data;
+	struct rspro_client_conn *conn = osmo_stream_srv_get_data(srv);
+	LOGPFSML(conn->fi, LOGL_DEBUG, "Tx IPA PING\n");
 	osmo_stream_srv_send(srv, msg);
 	return 0;
 }
@@ -788,6 +790,7 @@
 {
 	struct osmo_stream_srv *peer = data;
 	struct rspro_client_conn *conn = osmo_stream_srv_get_data(peer);
+	LOGPFSML(conn->fi, LOGL_NOTICE, "IPA PONG Timeout\n");
 	osmo_fsm_inst_dispatch(conn->fi, CLNTC_E_KA_TIMEOUT, NULL);
 	return 0;
 }

To view, visit change 39132. To unsubscribe, or for help writing mail filters, visit settings.