[sr-dev] git:master:68d9f429: local_timer.c: logging: DBG -> LM_DBG

Module: kamailio Branch: master Commit: 68d9f4296f4128dece2fdd3db95c7e5bdce86507 URL: https://github.com/kamailio/kamailio/commit/68d9f4296f4128dece2fdd3db95c7e5… Author: Ovidiu Sas &lt;osas(a)voipembedded.com&gt; Committer: Ovidiu Sas &lt;osas(a)voipembedded.com&gt; Date: 2015-01-13T12:47:03-05:00 local_timer.c: logging: DBG -> LM_DBG --- Modified: local_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/68d9f4296f4128dece2fdd3db95c7e5… Patch: https://github.com/kamailio/kamailio/commit/68d9f4296f4128dece2fdd3db95c7e5… --- diff --git a/local_timer.c b/local_timer.c index 3e7c67d..6b541fd 100644 --- a/local_timer.c +++ b/local_timer.c @@ -57,7 +57,7 @@ int init_local_timer(struct local_timer *t, ticks_t crt_ticks) for (r=0; r<H2_ENTRIES; r++) _timer_init_list(&t->timer_lst.h2[r]); _timer_init_list(&t->timer_lst.expired); - DBG("init_local_timer: timer_list between %p and %p\n", + LM_DBG("timer_list between %p and %p\n", &t->timer_lst.h0[0], &t->timer_lst.h2[H2_ENTRIES]); return 0; } @@ -141,8 +141,8 @@ int local_timer_add(struct local_timer* h, struct timer_ln* tl, ticks_t delta, int ret; if (unlikely(tl->flags & F_TIMER_ACTIVE)){ - DBG("timer_add called on an active timer %p (%p, %p)," - " flags %x\n", tl, tl->next, tl->prev, tl->flags); + LM_DBG("called on an active timer %p (%p, %p), flags %x\n", + tl, tl->next, tl->prev, tl->flags); ret=-1; /* refusing to add active or non-reinit. timer */ goto error; } @@ -170,16 +170,15 @@ void local_timer_del(struct local_timer* h, struct timer_ln* tl) { /* quick exit if timer inactive */ if (unlikely(!(tl->flags & F_TIMER_ACTIVE))){ - DBG("timer_del called on an inactive timer %p (%p, %p)," - " flags %x\n", tl, tl->next, tl->prev, tl->flags); + LM_DBG("called on an inactive timer %p (%p, %p), flags %x\n", + tl, tl->next, tl->prev, tl->flags); return; } if (likely((tl->next!=0)&&(tl->prev!=0))){ _timer_rm_list(tl); /* detach */ tl->next=tl->prev=0; }else{ - DBG("timer_del: (f) timer %p (%p, %p) flags %x " - "already detached\n", + LM_DBG("(f) timer %p (%p, %p) flags %x already detached\n", tl, tl->next, tl->prev, tl->flags); } } @@ -193,9 +192,7 @@ inline static void local_timer_list_expire(struct local_timer* l, struct timer_ln * tl; ticks_t ret; - /*DBG("timer_list_expire @ ticks = %lu, list =%p\n", - (unsigned long) *ticks, h); - */ + /*LM_DBG("@ ticks = %lu, list =%p\n", (unsigned long) *ticks, h); */ while(h->next!=(struct timer_ln*)h){ tl=h->next; _timer_rm_list(tl); /* detach */