mer-hybris/ofono-ril-binder-plugin
1
0
Fork 0
mirror of https://github.com/mer-hybris/ofono-ril-binder-plugin synced 2025-11-03 22:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[rilbinder] Fix logging. JB#44551

Browse Source 
ofono's DBG magic doesn't work in a shared library because
debug descriptors end up in library's own __debug section
and they never get enabled because ofono doesn't know anything
about them.

Expose libglibutil style descriptors instead and explicitly
hook them up.
This commit is contained in:
Slava Monich
2019-04-25 01:55:07 +03:00
parent a43e45f962
commit ccea6e5961
4 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -12,10 +12,12 @@
# on all platforms.
#
LIB_LDPKGS = libgrilio libgbinder libgbinder-radio libglibutil gobject-2.0 glib-2.0
PKGS = libgbinder libgbinder-radio libgrilio libglibutil gobject-2.0 glib-2.0
LIB_LDPKGS = $(PKGS)
LIB_PKGS = $(LIB_LDPKGS)
PLUGIN_LDPKGS = libgrilio libglibutil
PLUGIN_LDPKGS = $(PKGS)
PLUGIN_PKGS = ofono $(PLUGIN_LDPKGS)
#

3
include/ril_binder_radio.h
View File

@@ -39,6 +39,9 @@ GRilIoTransport*
ril_binder_radio_new(
GHashTable* args);
/* Logging */
extern GLogModule ril_binder_radio_log;
#endif /* RIL_BINDER_RADIO_H */
/*

61
src/ril_binder_plugin.c
View File

@@ -35,8 +35,65 @@
#include <ofono/ril-transport.h>
#include <ofono/log.h>
#include <radio_types.h>
#include <gbinder_types.h>
#include <gutil_log.h>
#include "ril_binder_radio.h"
/*==========================================================================*
* Logging
*==========================================================================*/
static
void
ril_binder_plugin_binder_log_notify(
struct ofono_debug_desc* desc)
{
gbinder_log.level = (desc->flags & OFONO_DEBUG_FLAG_PRINT) ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_INHERIT;
}
static struct ofono_debug_desc gbinder_debug OFONO_DEBUG_ATTR = {
.name = "binder",
.flags = OFONO_DEBUG_FLAG_DEFAULT,
.notify = ril_binder_plugin_binder_log_notify
};
static
void
ril_binder_plugin_binder_radio_log_notify(
struct ofono_debug_desc* desc)
{
gbinder_radio_log.level = (desc->flags & OFONO_DEBUG_FLAG_PRINT) ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_INHERIT;
}
static struct ofono_debug_desc gbinder_radio_debug OFONO_DEBUG_ATTR = {
.name = "binder-radio",
.flags = OFONO_DEBUG_FLAG_DEFAULT,
.notify = ril_binder_plugin_binder_radio_log_notify
};
static
void
ril_binder_plugin_ril_binder_log_notify(
struct ofono_debug_desc* desc)
{
ril_binder_radio_log.level = (desc->flags & OFONO_DEBUG_FLAG_PRINT) ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_INHERIT;
}
static struct ofono_debug_desc grilio_binder_log_debug OFONO_DEBUG_ATTR = {
.name = "ril-binder",
.flags = OFONO_DEBUG_FLAG_DEFAULT,
.notify = ril_binder_plugin_ril_binder_log_notify
};
/*==========================================================================*
* Transport
*==========================================================================*/
static
struct grilio_transport*
ril_binder_transport_connect(
@@ -51,6 +108,10 @@ static const struct ofono_ril_transport ril_binder_transport = {
.connect = ril_binder_transport_connect
};
/*==========================================================================*
* Plugin
*==========================================================================*/
static
int
ril_binder_plugin_init()

43
src/ril_binder_radio.c
View File

@@ -46,9 +46,13 @@
#include <radio_instance.h>
#include <gutil_idlequeue.h>
#include <gutil_log.h>
#include <gutil_misc.h>
/* Logging */
#define GLOG_MODULE_NAME ril_binder_radio_log
#include <gutil_log.h>
GLOG_MODULE_DEFINE("grilio-binder");
#define RIL_BINDER_KEY_MODEM "modem"
#define RIL_BINDER_KEY_DEV "dev"
#define RIL_BINDER_KEY_NAME "name"
@@ -100,7 +104,8 @@ G_DEFINE_TYPE(RilBinderRadio, ril_binder_radio, GRILIO_TYPE_TRANSPORT)
#define PARENT_CLASS ril_binder_radio_parent_class
#define DBG_(self,fmt,args...) DBG("%s" fmt, (self)->parent.log_prefix, ##args)
#define DBG_(self,fmt,args...) \
GDEBUG("%s" fmt, (self)->parent.log_prefix, ##args)
/*==========================================================================*
* Utilities
@@ -3069,40 +3074,6 @@ ril_binder_radio_init_base(
return FALSE;
}
/*==========================================================================*
* Logging
*==========================================================================*/
static
void
ril_binder_radio_gbinder_log_notify(
struct ofono_debug_desc* desc)
{
gbinder_log.level = (desc->flags & OFONO_DEBUG_FLAG_PRINT) ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_INHERIT;
}
static struct ofono_debug_desc gbinder_debug OFONO_DEBUG_ATTR = {
.name = "gbinder",
.flags = OFONO_DEBUG_FLAG_DEFAULT,
.notify = ril_binder_radio_gbinder_log_notify
};
static
void
ril_binder_radio_gbinder_radio_log_notify(
struct ofono_debug_desc* desc)
{
gbinder_radio_log.level = (desc->flags & OFONO_DEBUG_FLAG_PRINT) ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_INHERIT;
}
static struct ofono_debug_desc gbinder_radio_debug OFONO_DEBUG_ATTR = {
.name = "gbinder-radio",
.flags = OFONO_DEBUG_FLAG_DEFAULT,
.notify = ril_binder_radio_gbinder_radio_log_notify
};
/*==========================================================================*
* Internals
*==========================================================================*/