acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

update trace code

This commit is contained in:
Sukchan Lee 2017-08-02 19:33:57 +09:00
parent bcbb08acf5
commit 4c124cb540
17 changed files with 64 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/src/unix/mutex.c
View File

@ -1,3 +1,5 @@
#define TRACE_MODULE _mutex
#include "core.h"
#include "core_arch_mutex.h"
#include "core_errno.h"
@ -16,7 +18,7 @@ status_t mutex_init(void)
status_t mutex_final(void)
{
d_print("%d not freed in mutex_pool[%d]\n",
d_trace(1, "%d not freed in mutex_pool[%d]\n",
pool_size(&mutex_pool) - pool_avail(&mutex_pool),
pool_size(&mutex_pool));
pool_final(&mutex_pool);

19
lib/core/src/unix/pkbuf.c
View File

@ -1,5 +1,6 @@
#include "core.h"
#define TRACE_MODULE _pkbuf
#include "core.h"
#include "core_pkbuf.h"
#include "core_errno.h"
#include "core_lib.h"
@ -82,28 +83,28 @@ status_t pkbuf_final(void)
void pkbuf_show(void)
{
d_print("%d not freed in pkbuf_pool[%d]\n",
d_trace(1, "%d not freed in pkbuf_pool[%d]\n",
pool_size(&pkbuf_pool) - pool_avail(&pkbuf_pool),
pool_size(&pkbuf_pool));
d_print("%d not freed in clbuf_pool[%d]\n",
d_trace(1, "%d not freed in clbuf_pool[%d]\n",
pool_size(&clbuf_pool) - pool_avail(&clbuf_pool),
pool_size(&clbuf_pool));
d_print("%d not freed in cluster128_pool[%d]\n",
d_trace(1, "%d not freed in cluster128_pool[%d]\n",
pool_size(&cluster_128_pool) - pool_avail(&cluster_128_pool),
pool_size(&cluster_128_pool));
d_print("%d not freed in cluster256_pool[%d]\n",
d_trace(1, "%d not freed in cluster256_pool[%d]\n",
pool_size(&cluster_256_pool) - pool_avail(&cluster_256_pool),
pool_size(&cluster_256_pool));
d_print("%d not freed in cluster512_pool[%d]\n",
d_trace(1, "%d not freed in cluster512_pool[%d]\n",
pool_size(&cluster_512_pool) - pool_avail(&cluster_512_pool),
pool_size(&cluster_512_pool));
d_print("%d not freed in cluster1024_pool[%d]\n",
d_trace(1, "%d not freed in cluster1024_pool[%d]\n",
pool_size(&cluster_1024_pool) - pool_avail(&cluster_1024_pool),
pool_size(&cluster_1024_pool));
d_print("%d not freed in cluster2048_pool[%d]\n",
d_trace(1, "%d not freed in cluster2048_pool[%d]\n",
pool_size(&cluster_2048_pool) - pool_avail(&cluster_2048_pool),
pool_size(&cluster_2048_pool));
d_print("%d not freed in cluster8192_pool[%d]\n",
d_trace(1, "%d not freed in cluster8192_pool[%d]\n",
pool_size(&cluster_8192_pool) - pool_avail(&cluster_8192_pool),
pool_size(&cluster_8192_pool));
}

2
lib/gtp/gtp_xact.c
View File

@ -67,7 +67,7 @@ status_t gtp_xact_final(void)
if (gtp_xact_pool_initialized == 1 &&
pool_size(&gtp_xact_pool) == pool_avail(&gtp_xact_pool))
{
d_print("%d not freed in gtp_xact_pool[%d] of GTP Transaction\n",
d_trace(1, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n",
pool_size(&gtp_xact_pool) - pool_avail(&gtp_xact_pool),
pool_size(&gtp_xact_pool));
index_final(&gtp_xact_pool);

5
src/hss/hss_context.c
View File

@ -299,6 +299,11 @@ status_t hss_context_setup_trace_module()
if (others)
{
extern int _mutex;
d_trace_level(&_mutex, others);
extern int _pkbuf;
d_trace_level(&_pkbuf, others);
extern int _context;
d_trace_level(&_context, others);
extern int _hss_context;

8
src/mme/emm_sm.c
View File

@ -14,7 +14,7 @@ void emm_state_initial(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
FSM_TRAN(s, &emm_state_operational);
}
@ -23,7 +23,7 @@ void emm_state_final(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
}
void emm_state_operational(fsm_t *s, event_t *e)
@ -31,7 +31,7 @@ void emm_state_operational(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{
@ -221,7 +221,7 @@ void emm_state_exception(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{

8
src/mme/esm_sm.c
View File

@ -12,7 +12,7 @@ void esm_state_initial(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
FSM_TRAN(s, &esm_state_operational);
}
@ -21,7 +21,7 @@ void esm_state_final(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
}
void esm_state_operational(fsm_t *s, event_t *e)
@ -29,7 +29,7 @@ void esm_state_operational(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{
@ -144,7 +144,7 @@ void esm_state_exception(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{

5
src/mme/mme_context.c
View File

@ -852,6 +852,11 @@ status_t mme_context_setup_trace_module()
if (others)
{
extern int _mutex;
d_trace_level(&_mutex, others);
extern int _pkbuf;
d_trace_level(&_pkbuf, others);
extern int _context;
d_trace_level(&_context, others);
extern int _mme_context;

2
src/mme/mme_s6a_handler.c
View File

@ -605,7 +605,7 @@ void mme_s6a_final(void)
{
d_assert(fd_sess_handler_destroy(&mme_s6a_reg, NULL) == 0,,);
d_print("%d not freed in sess_state_pool[%d] of S6A-SM\n",
d_trace(1, "%d not freed in sess_state_pool[%d] of S6A-SM\n",
pool_size(&sess_state_pool) - pool_avail(&sess_state_pool),
pool_size(&sess_state_pool));

6
src/mme/mme_sm.c
View File

@ -14,7 +14,7 @@
void mme_state_initial(fsm_t *s, event_t *e)
{
mme_sm_trace(1, e);
mme_sm_trace(3, e);
d_assert(s, return, "Null param");
@ -23,7 +23,7 @@ void mme_state_initial(fsm_t *s, event_t *e)
void mme_state_final(fsm_t *s, event_t *e)
{
mme_sm_trace(1, e);
mme_sm_trace(3, e);
d_assert(s, return, "Null param");
}
@ -35,7 +35,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
status_t rv;
char buf[INET_ADDRSTRLEN];
mme_sm_trace(1, e);
mme_sm_trace(3, e);
d_assert(s, return, "Null param");

4
src/mme/s1ap_handler.c
View File

@ -153,7 +153,7 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
}
#endif
d_assert(enb->s1ap_sock, return,);
d_trace(1, "[S1AP] S1SetupRequest : eNB[%s:%d] --> MME\n",
d_trace(3, "[S1AP] S1SetupRequest : eNB[%s:%d] --> MME\n",
INET_NTOP(&enb->s1ap_sock->remote.sin_addr.s_addr, buf),
enb_id);
@ -164,7 +164,7 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
d_assert(s1ap_send_to_enb(enb, s1apbuf) == CORE_OK, , "send error");
d_assert(enb->s1ap_sock, return,);
d_trace(1, "[S1AP] S1SetupResponse: eNB[%s:%d] <-- MME\n",
d_trace(3, "[S1AP] S1SetupResponse: eNB[%s:%d] <-- MME\n",
INET_NTOP(&enb->s1ap_sock->remote.sin_addr.s_addr, buf),
enb_id);
}

8
src/mme/s1ap_sm.c
View File

@ -14,7 +14,7 @@ void s1ap_state_initial(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
FSM_TRAN(s, &s1ap_state_operational);
}
@ -23,7 +23,7 @@ void s1ap_state_final(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
}
void s1ap_state_operational(fsm_t *s, event_t *e)
@ -31,7 +31,7 @@ void s1ap_state_operational(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{
@ -203,7 +203,7 @@ void s1ap_state_exception(fsm_t *s, event_t *e)
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(1, e);
mme_sm_trace(3, e);
switch (event_get(e))
{

9
src/pgw/pgw_context.c
View File

@ -49,10 +49,10 @@ status_t pgw_context_final()
gtp_xact_delete_all(&self.s5c_node);
pgw_sess_remove_all();
d_print("%d not freed in pgw_sess_pool[%d] in PGW-Context\n",
d_trace(1, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n",
index_size(&pgw_sess_pool) - pool_avail(&pgw_sess_pool),
index_size(&pgw_sess_pool));
d_print("%d not freed in pgw_ip_pool[%d] in PGW-Context\n",
d_trace(1, "%d not freed in pgw_ip_pool[%d] in PGW-Context\n",
index_size(&pgw_ip_pool_pool) - pool_avail(&pgw_ip_pool_pool),
index_size(&pgw_ip_pool_pool));
@ -420,6 +420,11 @@ status_t pgw_context_setup_trace_module()
if (others)
{
extern int _mutex;
d_trace_level(&_mutex, others);
extern int _pkbuf;
d_trace_level(&_pkbuf, others);
extern int _context;
d_trace_level(&_context, others);
extern int _pgw_context;

6
src/pgw/pgw_sm.c
View File

@ -9,7 +9,7 @@
void pgw_state_initial(fsm_t *s, event_t *e)
{
pgw_sm_trace(1, e);
pgw_sm_trace(3, e);
d_assert(s, return, "Null param");
@ -18,7 +18,7 @@ void pgw_state_initial(fsm_t *s, event_t *e)
void pgw_state_final(fsm_t *s, event_t *e)
{
pgw_sm_trace(1, e);
pgw_sm_trace(3, e);
d_assert(s, return, "Null param");
}
@ -27,7 +27,7 @@ void pgw_state_operational(fsm_t *s, event_t *e)
{
status_t rv;
pgw_sm_trace(1, e);
pgw_sm_trace(3, e);
d_assert(s, return, "Null param");

7
src/sgw/sgw_context.c
View File

@ -50,7 +50,7 @@ status_t sgw_context_final()
sgw_sess_remove_all();
d_print("%d not freed in sgw_sess_pool[%d] in SGW-Context\n",
d_trace(1, "%d not freed in sgw_sess_pool[%d] in SGW-Context\n",
index_size(&sgw_sess_pool) - pool_avail(&sgw_sess_pool),
index_size(&sgw_sess_pool));
index_final(&sgw_bearer_pool);
@ -412,6 +412,11 @@ status_t sgw_context_setup_trace_module()
if (others)
{
extern int _mutex;
d_trace_level(&_mutex, others);
extern int _pkbuf;
d_trace_level(&_pkbuf, others);
extern int _context;
d_trace_level(&_context, others);
extern int _sgw_context;

6
src/sgw/sgw_sm.c
View File

@ -8,7 +8,7 @@
void sgw_state_initial(fsm_t *s, event_t *e)
{
sgw_sm_trace(1, e);
sgw_sm_trace(3, e);
d_assert(s, return, "Null param");
@ -17,7 +17,7 @@ void sgw_state_initial(fsm_t *s, event_t *e)
void sgw_state_final(fsm_t *s, event_t *e)
{
sgw_sm_trace(1, e);
sgw_sm_trace(3, e);
d_assert(s, return, "Null param");
}
@ -26,7 +26,7 @@ void sgw_state_operational(fsm_t *s, event_t *e)
{
status_t rv;
sgw_sm_trace(1, e);
sgw_sm_trace(3, e);
d_assert(s, return, "Null param");

2
test/abts.c
View File

@ -429,8 +429,8 @@ int main(int argc, const char *const argv[]) {
int list_provided = 0;
abts_suite *suite = NULL;
d_trace_global_off();
test_initialize();
d_trace_global_off();
quiet = !isatty(STDOUT_FILENO);

2
test/testutil.c
View File

@ -55,6 +55,8 @@ static void test_s6a_hook_handler(enum fd_hook_type type, struct msg * msg,
void test_terminate(void)
{
d_trace_global_on();
app_terminate();
core_terminate();
}