Skip to content

Commit 50b8fd6

Browse files
vveljkovveljko
committed
Add tracing logs
Most are for the timer list module.
1 parent 6174ed0 commit 50b8fd6

File tree

4 files changed

+46
-5
lines changed

4 files changed

+46
-5
lines changed

‎core/pbpal_ntf_callback_admin.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ void pbntf_trans_outcome(pubnub_t* pb)
1111
{
1212
PBNTF_TRANS_OUTCOME_COMMON(pb);
1313
if (pb->cb != NULL) {
14+
PUBNUB_LOG_TRACE("pbntf_trans_outcome(pb=%p) calling callback:\n"
15+
"pb->trans = %d, pb->core.last_result=%d, pb->user_data=%p\n",
16+
pb, pb->trans, pb->core.last_result, pb->user_data);
1417
pb->cb(pb, pb->trans, pb->core.last_result, pb->user_data);
1518
}
1619
}

‎core/pbpal_ntf_callback_handle_timer_list.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "pubnub_timer_list.h"
77
#include "pubnub_assert.h"
8+
#include "pubnub_log.h"
89

910

1011
void pbntf_handle_timer_list(int ms_elapsed, pubnub_t** head)
@@ -40,5 +41,11 @@ void pbpal_remove_timer_safe(pubnub_t* to_remove, pubnub_t** from_head)
4041
|| (to_remove == *from_head)) {
4142
*from_head = pubnub_timer_list_remove(*from_head, to_remove);
4243
}
44+
else {
45+
PUBNUB_LOG_TRACE("pbpal_remove_timer_safe(to_remove=%p, *from_head=%p) don't remove:\n"
46+
"to_remove->previous=%p, to_remove->next=%p\n",
47+
to_remove, *from_head,
48+
to_remove->previous, to_remove->next);
49+
}
4350
}
4451
}

‎core/pubnub_netcore.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,14 @@ static char const* pbnc_state2str(enum pubnub_state e)
267267

268268
static int send_init_GET_or_CONNECT(struct pubnub_* pb)
269269
{
270+
PUBNUB_LOG_TRACE("send_init_GET_or_CONNECT(pb=%p): pb->trans = %d\n",
271+
pb, pb->trans);
270272
#if PUBNUB_PROXY_API
271273
if ((pb->proxy_type == pbproxyHTTP_CONNECT) && (!pb->proxy_tunnel_established)) {
272274
return pbpal_send_literal_str(pb, "CONNECT ");
273275
}
274-
else {
275-
return pbpal_send_literal_str(pb, "GET ");
276-
}
277-
#else
278-
return pbpal_send_literal_str(pb, "GET ");
279276
#endif
277+
return pbpal_send_literal_str(pb, "GET ");
280278
}
281279

282280

‎core/pubnub_timer_list.c‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "pubnub_internal.h"
55
#include "pubnub_assert.h"
6+
#include "pubnub_log.h"
67

78

89
void pubnub_timer_list_init(pubnub_t* pbp)
@@ -20,6 +21,8 @@ pubnub_t* pubnub_timer_list_add(pubnub_t* list, pubnub_t* to_add)
2021

2122
timeout_to_add_ms = to_add->transaction_timeout_ms;
2223
if (NULL == list) {
24+
PUBNUB_LOG_TRACE("pubnub_timer_list_add(list=NULL, to_add=%p)\n",
25+
to_add);
2326
list = to_add;
2427
to_add->previous = to_add->next = NULL;
2528
to_add->timeout_left_ms = timeout_to_add_ms;
@@ -28,6 +31,10 @@ pubnub_t* pubnub_timer_list_add(pubnub_t* list, pubnub_t* to_add)
2831

2932
PUBNUB_ASSERT_OPT(list != to_add);
3033
if (timeout_to_add_ms < list->timeout_left_ms) {
34+
PUBNUB_LOG_TRACE("pubnub_timer_list_add(list=%p, to_add=%p): "
35+
"list->timeout_left_ms=%d, to_add->transaction_timeout_ms=%d\n",
36+
list, to_add,
37+
list->timeout_left_ms, to_add->transaction_timeout_ms);
3138
list->timeout_left_ms -= timeout_to_add_ms;
3239
to_add->next = list;
3340
to_add->previous = NULL;
@@ -38,8 +45,15 @@ pubnub_t* pubnub_timer_list_add(pubnub_t* list, pubnub_t* to_add)
3845

3946
pbp = list;
4047
while (timeout_to_add_ms >= pbp->timeout_left_ms) {
48+
PUBNUB_LOG_TRACE("pubnub_timer_list_add(list=%p, to_add=%p) while: "
49+
"pbp=%p, pbp->timeout_left_ms=%d, timeout_to_add_ms=%d\n",
50+
list, to_add, pbp,
51+
pbp->timeout_left_ms, timeout_to_add_ms);
4152
timeout_to_add_ms -= pbp->timeout_left_ms;
4253
if (NULL == pbp->next) {
54+
PUBNUB_LOG_TRACE("pubnub_timer_list_add() end while: "
55+
"pbp=%p, timeout_to_add_ms=%d\n",
56+
pbp, timeout_to_add_ms);
4357
pbp->next = to_add;
4458
to_add->previous = pbp;
4559
to_add->next = NULL;
@@ -50,6 +64,10 @@ pubnub_t* pubnub_timer_list_add(pubnub_t* list, pubnub_t* to_add)
5064
PUBNUB_ASSERT_OPT(pbp != to_add);
5165
}
5266

67+
PUBNUB_LOG_TRACE("pubnub_timer_list_add() crocodile: "
68+
"pb=%p, pbp->timeout_left_ms=%d, timeout_to_add_ms=%d\n",
69+
pbp,
70+
pbp->timeout_left_ms, timeout_to_add_ms);
5371
pbp->timeout_left_ms -= timeout_to_add_ms;
5472
to_add->next = pbp;
5573
to_add->previous = pbp->previous;
@@ -69,8 +87,15 @@ pubnub_t* pubnub_timer_list_remove(pubnub_t* list, pubnub_t* to_remove)
6987
PUBNUB_ASSERT_OPT(to_remove != NULL);
7088

7189
if (list == to_remove) {
90+
PUBNUB_LOG_TRACE("pubnub_timer_list_remove(list=%p == to_remove): "
91+
"list->timeout_left_ms=%d\n",
92+
list, list->timeout_left_ms);
93+
7294
list = list->next;
7395
if (NULL != list) {
96+
PUBNUB_LOG_TRACE("pubnub_timer_list_remove() has next: "
97+
"list=%p, list->timeout_left_ms=%d, to_remove->timeout_left_ms=%d\n",
98+
list, list->timeout_left_ms, to_remove->timeout_left_ms);
7499
list->timeout_left_ms += to_remove->timeout_left_ms;
75100
list->previous = NULL;
76101
}
@@ -79,11 +104,19 @@ pubnub_t* pubnub_timer_list_remove(pubnub_t* list, pubnub_t* to_remove)
79104
}
80105

81106
if (NULL == to_remove->next) {
107+
PUBNUB_LOG_TRACE("pubnub_timer_list_remove(list=%p, to_remove=%p) tail\n",
108+
list, to_remove);
82109
to_remove->previous->next = NULL;
83110
to_remove->previous = NULL;
84111
return list;
85112
}
86113

114+
PUBNUB_LOG_TRACE("pubnub_timer_list_remove(list=%p, to_remove=%p) default:\n"
115+
"to_remove->next=%p, to_remove->previous=%p\n"
116+
"to_remove->timeout_left_ms=%d, to_remove->next->timeout_left_ms=%d\n",
117+
list, to_remove,
118+
to_remove->next, to_remove->previous,
119+
to_remove->timeout_left_ms, to_remove->next->timeout_left_ms);
87120
to_remove->next->timeout_left_ms += to_remove->timeout_left_ms;
88121
to_remove->previous->next = to_remove->next;
89122
to_remove->next->previous = to_remove->previous;

0 commit comments

Comments
 (0)