From e2f1872ea7cc6043a8caeb270fba75b40d316bdc Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Wed, 17 Jan 2018 22:55:52 +0900 Subject: [PATCH] loglevel is adjusted --- lib/core/src/unix/mutex.c | 3 +-- lib/core/src/unix/pkbuf.c | 16 ++++++++-------- lib/gtp/gtp_node.c | 10 ++++------ lib/gtp/gtp_xact.c | 33 +++++++++++++++------------------ src/pgw/pgw_context.c | 4 ++-- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/lib/core/src/unix/mutex.c b/lib/core/src/unix/mutex.c index 6df4cb0eb..d08a97bdd 100644 --- a/lib/core/src/unix/mutex.c +++ b/lib/core/src/unix/mutex.c @@ -22,8 +22,7 @@ status_t mutex_final(void) d_error("%d not freed in mutex_pool[%d]", pool_size(&mutex_pool) - pool_avail(&mutex_pool), pool_size(&mutex_pool)); - - d_trace(1, "%d not freed in mutex_pool[%d]\n", + d_trace(5, "%d not freed in mutex_pool[%d]\n", pool_size(&mutex_pool) - pool_avail(&mutex_pool), pool_size(&mutex_pool)); pool_final(&mutex_pool); diff --git a/lib/core/src/unix/pkbuf.c b/lib/core/src/unix/pkbuf.c index 86d50db4c..bc54796dc 100644 --- a/lib/core/src/unix/pkbuf.c +++ b/lib/core/src/unix/pkbuf.c @@ -86,49 +86,49 @@ void pkbuf_show(void) if (pool_used(&pkbuf_pool)) d_error("%d not freed in pkbuf_pool[%d]", pool_used(&pkbuf_pool), pool_size(&pkbuf_pool)); - d_trace(3, "%d not freed in pkbuf_pool[%d]\n", + d_trace(5, "%d not freed in pkbuf_pool[%d]\n", pool_used(&pkbuf_pool), pool_size(&pkbuf_pool)); if (pool_used(&clbuf_pool)) d_error("%d not freed in clbuf_pool[%d]", pool_used(&clbuf_pool), pool_size(&clbuf_pool)); - d_trace(3, "%d not freed in clbuf_pool[%d]\n", + d_trace(5, "%d not freed in clbuf_pool[%d]\n", pool_used(&clbuf_pool), pool_size(&clbuf_pool)); if (pool_used(&cluster_128_pool)) d_error("%d not freed in cluster128_pool[%d]", pool_used(&cluster_128_pool), pool_size(&cluster_128_pool)); - d_trace(3, "%d not freed in cluster128_pool[%d]\n", + d_trace(5, "%d not freed in cluster128_pool[%d]\n", pool_used(&cluster_128_pool), pool_size(&cluster_128_pool)); if (pool_used(&cluster_256_pool)) d_error("%d not freed in cluster256_pool[%d]", pool_used(&cluster_256_pool), pool_size(&cluster_256_pool)); - d_trace(3, "%d not freed in cluster256_pool[%d]\n", + d_trace(5, "%d not freed in cluster256_pool[%d]\n", pool_used(&cluster_256_pool), pool_size(&cluster_256_pool)); if (pool_used(&cluster_512_pool)) d_error("%d not freed in cluster512_pool[%d]", pool_used(&cluster_512_pool), pool_size(&cluster_512_pool)); - d_trace(3, "%d not freed in cluster512_pool[%d]\n", + d_trace(5, "%d not freed in cluster512_pool[%d]\n", pool_used(&cluster_512_pool), pool_size(&cluster_512_pool)); if (pool_used(&cluster_1024_pool)) d_error("%d not freed in cluster1024_pool[%d]", pool_used(&cluster_1024_pool), pool_size(&cluster_1024_pool)); - d_trace(3, "%d not freed in cluster1024_pool[%d]\n", + d_trace(5, "%d not freed in cluster1024_pool[%d]\n", pool_used(&cluster_1024_pool), pool_size(&cluster_1024_pool)); if (pool_used(&cluster_2048_pool)) d_error("%d not freed in cluster2048_pool[%d]", pool_used(&cluster_2048_pool), pool_size(&cluster_2048_pool)); - d_trace(3, "%d not freed in cluster2048_pool[%d]\n", + d_trace(5, "%d not freed in cluster2048_pool[%d]\n", pool_used(&cluster_2048_pool), pool_size(&cluster_2048_pool)); if (pool_used(&cluster_8192_pool)) d_error("%d not freed in cluster8192_pool[%d]", pool_used(&cluster_8192_pool), pool_size(&cluster_8192_pool)); - d_trace(3, "%d not freed in cluster8192_pool[%d]\n", + d_trace(5, "%d not freed in cluster8192_pool[%d]\n", pool_used(&cluster_8192_pool), pool_size(&cluster_8192_pool)); } diff --git a/lib/gtp/gtp_node.c b/lib/gtp/gtp_node.c index f3ae9c100..a09dbac4e 100644 --- a/lib/gtp/gtp_node.c +++ b/lib/gtp/gtp_node.c @@ -18,13 +18,11 @@ status_t gtp_node_init(void) } status_t gtp_node_final(void) { - if (pool_size(>p_node_pool) != pool_avail(>p_node_pool)) + if (pool_used(>p_node_pool)) d_error("%d not freed in gtp_node_pool[%d]", - pool_size(>p_node_pool) - pool_avail(>p_node_pool), - pool_size(>p_node_pool)); - d_trace(3, "%d not freed in gtp_node_pool[%d]\n", - pool_size(>p_node_pool) - pool_avail(>p_node_pool), - pool_size(>p_node_pool)); + pool_used(>p_node_pool), pool_size(>p_node_pool)); + d_trace(5, "%d not freed in gtp_node_pool[%d]\n", + pool_used(>p_node_pool), pool_size(>p_node_pool)); pool_final(>p_node_pool); return CORE_OK; diff --git a/lib/gtp/gtp_xact.c b/lib/gtp/gtp_xact.c index 1b5882531..089224864 100644 --- a/lib/gtp/gtp_xact.c +++ b/lib/gtp/gtp_xact.c @@ -61,14 +61,11 @@ status_t gtp_xact_final(void) d_assert(gtp_xact_initialized == 1, return CORE_ERROR, "GTP Transaction context already has been finalized"); - if (pool_size(>p_xact_pool) != pool_avail(>p_xact_pool)) + if (pool_used(>p_xact_pool)) d_error("%d not freed in gtp_xact_pool[%d] of GTP Transaction", - pool_size(>p_xact_pool) - pool_avail(>p_xact_pool), - pool_size(>p_xact_pool)); - - d_trace(3, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n", - pool_size(>p_xact_pool) - pool_avail(>p_xact_pool), - pool_size(>p_xact_pool)); + pool_used(>p_xact_pool), pool_size(>p_xact_pool)); + d_trace(5, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n", + pool_used(>p_xact_pool), pool_size(>p_xact_pool)); index_final(>p_xact_pool); gtp_xact_initialized = 0; @@ -116,7 +113,7 @@ gtp_xact_t *gtp_xact_local_create( rv = gtp_xact_update_tx(xact, hdesc, pkbuf); d_assert(rv == CORE_OK, return NULL, "Update Tx failed"); - d_trace(3, "[%d] %s Create peer [%s]:%d\n", + d_trace(5, "[%d] %s Create peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -160,7 +157,7 @@ gtp_xact_t *gtp_xact_remote_create(gtp_node_t *gnode, c_uint32_t sqn) list_append(xact->org == GTP_LOCAL_ORIGINATOR ? &xact->gnode->local_list : &xact->gnode->remote_list, xact); - d_trace(3, "[%d] %s Create peer [%s]:%d\n", + d_trace(5, "[%d] %s Create peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -199,7 +196,7 @@ status_t gtp_xact_update_tx(gtp_xact_t *xact, d_assert(hdesc, return CORE_ERROR, "Null param"); d_assert(pkbuf, return CORE_ERROR, "Null param"); - d_trace(3, "[%d] %s UPD TX-%d peer [%s]:%d\n", + d_trace(5, "[%d] %s UPD TX-%d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", hdesc->type, @@ -292,7 +289,7 @@ status_t gtp_xact_update_rx(gtp_xact_t *xact, c_uint8_t type) char buf[CORE_ADDRSTRLEN]; gtp_xact_stage_t stage; - d_trace(3, "[%d] %s UPD RX-%d peer [%s]:%d\n", + d_trace(5, "[%d] %s UPD RX-%d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", type, @@ -497,7 +494,7 @@ status_t gtp_xact_commit(gtp_xact_t *xact) d_assert(xact, return CORE_ERROR, "Null param"); d_assert(xact->gnode, return CORE_ERROR, "Null param"); - d_trace(3, "[%d] %s Commit peer [%s]:%d\n", + d_trace(5, "[%d] %s Commit peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(xact->gnode->sock), buf), @@ -617,7 +614,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) if (event == g_response_event) { - d_trace(3, "[%d] %s Response Timeout " + d_trace(5, "[%d] %s Response Timeout " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -652,7 +649,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) } else if (event == g_holding_event) { - d_trace(3, "[%d] %s Holding Timeout " + d_trace(5, "[%d] %s Holding Timeout " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -667,7 +664,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) } else { - d_trace(3, "[%d] %s Delete Transaction " + d_trace(5, "[%d] %s Delete Transaction " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -700,7 +697,7 @@ status_t gtp_xact_receive( new = gtp_xact_remote_create(gnode, h->sqn); d_assert(new, return CORE_ERROR, "Null param"); - d_trace(3, "[%d] %s Receive peer [%s]:%d\n", + d_trace(5, "[%d] %s Receive peer [%s]:%d\n", new->xid, new->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -808,7 +805,7 @@ gtp_xact_t *gtp_xact_find_by_xid( if (xact) { - d_trace(3, "[%d] %s Find peer [%s]:%d\n", + d_trace(5, "[%d] %s Find peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -849,7 +846,7 @@ static status_t gtp_xact_delete(gtp_xact_t *xact) d_assert(xact, , "Null param"); d_assert(xact->gnode, , "Null param"); - d_trace(3, "[%d] %s Delete peer [%s]:%d\n", + d_trace(5, "[%d] %s Delete peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(xact->gnode->sock), buf), diff --git a/src/pgw/pgw_context.c b/src/pgw/pgw_context.c index 1c5a56c15..49bbf9b59 100644 --- a/src/pgw/pgw_context.c +++ b/src/pgw/pgw_context.c @@ -84,7 +84,7 @@ status_t pgw_context_final() if (index_used(&pgw_sess_pool)) d_error("%d not freed in pgw_sess_pool[%d] in PGW-Context", index_used(&pgw_sess_pool), index_size(&pgw_sess_pool)); - d_trace(3, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n", + d_trace(5, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n", index_used(&pgw_sess_pool), index_size(&pgw_sess_pool)); pgw_dev_remove_all(); @@ -1669,7 +1669,7 @@ status_t pgw_subnet_remove(pgw_subnet_t *subnet) d_warn("%d not freed in ue_ip_pool[%d] in PGW-Context", pool_used(&subnet->pool), pool_size(&subnet->pool)); } - d_trace(3, "%d not freed in ue_ip_pool[%d] in PGW-Context\n", + d_trace(5, "%d not freed in ue_ip_pool[%d] in PGW-Context\n", pool_used(&subnet->pool), pool_size(&subnet->pool)); pool_final(&subnet->pool);