From: Sangchul Lee Date: Wed, 21 Apr 2021 10:20:49 +0000 (+0900) Subject: webrtc_data_channel: Revise logs X-Git-Tag: submit/tizen/20210729.023123~92 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be8273dd7a4f2f45e8b0f3648e1a6dfc9a166527;p=platform%2Fcore%2Fapi%2Fwebrtc.git webrtc_data_channel: Revise logs Printing channel handle logs are added. [Version] 0.1.149 [Issue Type] Log Change-Id: I36fd5d292af3817c33f239fe3e697ad5f888110f Signed-off-by: Sangchul Lee --- diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec index b146aefb..f2a874d2 100644 --- a/packaging/capi-media-webrtc.spec +++ b/packaging/capi-media-webrtc.spec @@ -1,6 +1,6 @@ Name: capi-media-webrtc Summary: A WebRTC library in Tizen Native API -Version: 0.1.148 +Version: 0.1.149 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/webrtc.c b/src/webrtc.c index 852fee4a..044f357d 100644 --- a/src/webrtc.c +++ b/src/webrtc.c @@ -968,7 +968,7 @@ int webrtc_data_channel_set_open_cb(webrtc_data_channel_h channel, webrtc_data_c _channel->open_cb.callback = callback; _channel->open_cb.user_data = user_data; - LOG_INFO("callback[%p] user_data[%p]", callback, user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p]", _channel, callback, user_data); g_mutex_unlock(&_channel->mutex); @@ -985,8 +985,8 @@ int webrtc_data_channel_unset_open_cb(webrtc_data_channel_h channel) RET_VAL_WITH_UNLOCK_IF(_channel->open_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_channel->mutex, "callback was not set"); - LOG_INFO("callback[%p] user_data[%p] is reset to NULL", - _channel->open_cb.callback, _channel->open_cb.user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p] is reset to NULL", + _channel, _channel->open_cb.callback, _channel->open_cb.user_data); _channel->open_cb.callback = NULL; _channel->open_cb.user_data = NULL; @@ -1010,7 +1010,7 @@ int webrtc_data_channel_set_message_cb(webrtc_data_channel_h channel, webrtc_dat _channel->message_cb.callback = callback; _channel->message_cb.user_data = user_data; - LOG_INFO("callback[%p] user_data[%p]", callback, user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p]", _channel, callback, user_data); g_mutex_unlock(&_channel->mutex); @@ -1027,8 +1027,8 @@ int webrtc_data_channel_unset_message_cb(webrtc_data_channel_h channel) RET_VAL_WITH_UNLOCK_IF(_channel->message_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_channel->mutex, "callback was not set"); - LOG_INFO("callback[%p] user_data[%p] is reset to NULL", - _channel->message_cb.callback, _channel->message_cb.user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p] is reset to NULL", + _channel, _channel->message_cb.callback, _channel->message_cb.user_data); _channel->message_cb.callback = NULL; _channel->message_cb.user_data = NULL; @@ -1052,7 +1052,7 @@ int webrtc_data_channel_set_error_cb(webrtc_data_channel_h channel, webrtc_data_ _channel->error_cb.callback = callback; _channel->error_cb.user_data = user_data; - LOG_INFO("callback[%p] user_data[%p]", callback, user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p]", _channel, callback, user_data); g_mutex_unlock(&_channel->mutex); @@ -1069,8 +1069,8 @@ int webrtc_data_channel_unset_error_cb(webrtc_data_channel_h channel) RET_VAL_WITH_UNLOCK_IF(_channel->error_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_channel->mutex, "callback was not set"); - LOG_INFO("callback[%p] user_data[%p] is reset to NULL", - _channel->error_cb.callback, _channel->error_cb.user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p] is reset to NULL", + _channel, _channel->error_cb.callback, _channel->error_cb.user_data); _channel->error_cb.callback = NULL; _channel->error_cb.user_data = NULL; @@ -1094,7 +1094,7 @@ int webrtc_data_channel_set_close_cb(webrtc_data_channel_h channel, webrtc_data_ _channel->close_cb.callback = callback; _channel->close_cb.user_data = user_data; - LOG_INFO("callback[%p] user_data[%p]", callback, user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p]", _channel, callback, user_data); g_mutex_unlock(&_channel->mutex); @@ -1111,8 +1111,8 @@ int webrtc_data_channel_unset_close_cb(webrtc_data_channel_h channel) RET_VAL_WITH_UNLOCK_IF(_channel->close_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_channel->mutex, "callback was not set"); - LOG_INFO("callback[%p] user_data[%p] is reset to NULL", - _channel->close_cb.callback, _channel->close_cb.user_data); + LOG_INFO("channel[%p] callback[%p] user_data[%p] is reset to NULL", + _channel, _channel->close_cb.callback, _channel->close_cb.user_data); _channel->close_cb.callback = NULL; _channel->close_cb.user_data = NULL; @@ -1173,7 +1173,7 @@ int webrtc_data_channel_get_label(webrtc_data_channel_h channel, char **label) *label = strdup(_label); - LOG_INFO("label[%s]", *label); + LOG_INFO("channel[%p, label:%s]", _channel, *label); g_free(_label); diff --git a/src/webrtc_data_channel.c b/src/webrtc_data_channel.c index 7b8212aa..8f9bdfe2 100644 --- a/src/webrtc_data_channel.c +++ b/src/webrtc_data_channel.c @@ -23,7 +23,7 @@ static void __data_channel_on_open_cb(GObject *data_channel, gpointer user_data) RET_IF(channel == NULL, "channel is NULL"); - LOG_DEBUG("data_channel[%s] user_data[%p]", GST_OBJECT_NAME(data_channel), user_data); + LOG_DEBUG("channel[%p, %s] user_data[%p]", channel, GST_OBJECT_NAME(data_channel), user_data); if (channel->open_cb.callback) { LOG_DEBUG(">>> callback[%p] user_data[%p]", channel->open_cb.callback, channel->open_cb.user_data); @@ -38,7 +38,7 @@ static void __data_channel_on_message_string_cb(GObject *data_channel, gchar *st RET_IF(channel == NULL, "channel is NULL"); - LOG_INFO("data_channel[%s] <<<<< [%s]", GST_OBJECT_NAME(data_channel), string); + LOG_INFO("channel[%p, %s] <<<<< [%s]", channel, GST_OBJECT_NAME(data_channel), string); if (channel->message_cb.callback) { LOG_DEBUG(">>> callback[%p] user_data[%p]", channel->message_cb.callback, channel->message_cb.user_data); @@ -53,7 +53,8 @@ static void __data_channel_on_message_data_cb(GObject *data_channel, GBytes *byt RET_IF(channel == NULL, "channel is NULL"); - LOG_DEBUG("data_channel[%s] bytes[%p, size:%u] user_data[%p]", GST_OBJECT_NAME(data_channel), bytes, g_bytes_get_size(bytes), user_data); + LOG_DEBUG("channel[%p, %s] bytes[%p, size:%u] user_data[%p]", + channel, GST_OBJECT_NAME(data_channel), bytes, g_bytes_get_size(bytes), user_data); if (channel->message_cb.callback) { webrtc_bytes_data_s data = { 0, }; @@ -77,7 +78,7 @@ static void __data_channel_on_error_cb(GObject *data_channel, GError *error, gpo else if (error->domain == GST_STREAM_ERROR) err = WEBRTC_ERROR_STREAM_FAILED; - LOG_DEBUG("data_channel[%s] error[0x%x] user_data[%p]", GST_OBJECT_NAME(data_channel), err, user_data); + LOG_DEBUG("channel[%p, %s] error[0x%x] user_data[%p]", channel, GST_OBJECT_NAME(data_channel), err, user_data); if (channel->error_cb.callback) { LOG_DEBUG(">>> callback[%p] user_data[%p]", channel->error_cb.callback, channel->error_cb.user_data); @@ -92,7 +93,7 @@ static void __data_channel_on_close_cb(GObject *data_channel, gpointer user_data RET_IF(channel == NULL, "channel is NULL"); - LOG_DEBUG("data_channel[%s] user_data[%p]", GST_OBJECT_NAME(data_channel), user_data); + LOG_DEBUG("channel[%p, %s] user_data[%p]", channel, GST_OBJECT_NAME(data_channel), user_data); if (channel->close_cb.callback) { LOG_DEBUG(">>> callback[%p] user_data[%p]", channel->close_cb.callback, channel->close_cb.user_data); @@ -106,7 +107,7 @@ static void __invoke_data_channel_cb(webrtc_s *webrtc, webrtc_data_channel_s *ch RET_IF(webrtc == NULL, "webrtc is NULL"); RET_IF(channel == NULL, "channel is NULL"); - LOG_INFO("data_channel[%s]", GST_OBJECT_NAME(channel->channel)); + LOG_INFO("channel[%p, %s]", channel, GST_OBJECT_NAME(channel->channel)); if (webrtc->data_channel_cb.callback) { LOG_DEBUG(">>> callback[%p] user_data[%p]", webrtc->data_channel_cb.callback, webrtc->data_channel_cb.user_data); @@ -122,14 +123,14 @@ void _webrtcbin_on_data_channel_cb(GstElement *webrtcbin, GObject *data_channel, RET_IF(webrtc == NULL, "webrtc is NULL"); - LOG_DEBUG("data_channel[%s] user_data[%p]", GST_OBJECT_NAME(data_channel), user_data); - channel = g_new0(webrtc_data_channel_s, 1); g_mutex_init(&channel->mutex); g_mutex_lock(&channel->mutex); channel->channel = data_channel; + LOG_DEBUG("channel[%p, %s] user_data[%p]", channel, GST_OBJECT_NAME(data_channel), user_data); + g_hash_table_insert(webrtc->data_channels, (gpointer)channel, (gpointer)channel); _connect_and_append_signal(&channel->signals, channel->channel, "on-open", G_CALLBACK(__data_channel_on_open_cb), channel); @@ -172,14 +173,14 @@ int _create_data_channel(webrtc_s *webrtc, const char *label, bundle *options, w return WEBRTC_ERROR_INVALID_OPERATION; } - LOG_INFO("data channel[%s] label[%s] is created", GST_OBJECT_NAME(data_channel), label); - _channel = g_new0(webrtc_data_channel_s, 1); g_mutex_init(&_channel->mutex); g_mutex_lock(&_channel->mutex); _channel->channel = data_channel; + LOG_INFO("channel[%p, label:%s] is created", _channel, label); + _connect_and_append_signal(&_channel->signals, data_channel, "on-open", G_CALLBACK(__data_channel_on_open_cb), _channel); _connect_and_append_signal(&_channel->signals, data_channel, "on-message-string", G_CALLBACK(__data_channel_on_message_string_cb), _channel); _connect_and_append_signal(&_channel->signals, data_channel, "on-message-data", G_CALLBACK(__data_channel_on_message_data_cb), _channel); @@ -207,7 +208,7 @@ int _destroy_data_channel(webrtc_data_channel_s *channel) g_list_free_full(channel->signals, _disconnect_signal); channel->signals = NULL; - LOG_INFO("data_channel[%s] is destroyed", GST_OBJECT_NAME(channel->channel)); + LOG_INFO("channel[%p] is destroyed", channel); g_mutex_unlock(&channel->mutex); g_mutex_clear(&channel->mutex); @@ -257,7 +258,7 @@ int _data_channel_send_string(webrtc_data_channel_s *channel, const char *string g_signal_emit_by_name(channel->channel, "send-string", string); - LOG_INFO("data_channel[%s] >>>>> [%s]", GST_OBJECT_NAME(channel->channel), string); + LOG_INFO("channel[%p, %s] >>>>> [%s]", channel, GST_OBJECT_NAME(channel->channel), string); return WEBRTC_ERROR_NONE; } @@ -280,7 +281,7 @@ int _data_channel_send_bytes(webrtc_data_channel_s *channel, const char *data, u g_signal_emit_by_name(channel->channel, "send-data", bytes); - LOG_INFO("data_channel[%s] >>>>> [%p, size:%u]", GST_OBJECT_NAME(channel->channel), data, size); + LOG_INFO("channel[%p, %s] >>>>> [%p, size:%u]", channel, GST_OBJECT_NAME(channel->channel), data, size); g_bytes_unref(bytes);