electron
/
pulseview
mirror of git://sigrok.org/pulseview
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: implement chained log callbacks (buffer and terminal output) 

Query the libraries' default log handlers before registering the
application's own handler. Queue log messages in the application's
internal buffer _and_ hand them to the default handlers which send
the text to stdout as well.
This commit is contained in:
Gerhard Sittig 2018-08-20 18:57:25 +02:00 committed by Uwe Hermann
parent 4b9234088f
commit e2e4a66a86
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/loghandler.cpp
View File

@ -30,6 +30,14 @@
namespace pv { namespace pv {
static sr_log_callback prev_sr_log_cb;
static void *prev_sr_log_cb_data;
#ifdef ENABLE_DECODE
static srd_log_callback prev_srd_log_cb;
static void *prev_srd_log_cb_data;
#endif
int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *format, va_list args) int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *format, va_list args)
{ {
static const int prio[] = { static const int prio[] = {
@ -40,11 +48,18 @@ int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *form
[SR_LOG_DBG] = ANDROID_LOG_DEBUG, [SR_LOG_DBG] = ANDROID_LOG_DEBUG,
[SR_LOG_SPEW] = ANDROID_LOG_VERBOSE, [SR_LOG_SPEW] = ANDROID_LOG_VERBOSE,
}; };
va_list args2;
int ret; int ret;
/* This specific log callback doesn't need the void pointer data. */ /* This specific log callback doesn't need the void pointer data. */
(void)cb_data; (void)cb_data;
/* Call the previously registered log callback (library's default). */
va_copy(args2, args);
if (prev_sr_log_cb)
prev_sr_log_cb(prev_sr_log_cb_data, loglevel, format, args2);
va_end(args2);
/* Only output messages of at least the selected loglevel(s). */ /* Only output messages of at least the selected loglevel(s). */
if (loglevel > sr_log_loglevel_get()) if (loglevel > sr_log_loglevel_get())
return SR_OK; return SR_OK;
@ -70,11 +85,18 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
[SRD_LOG_DBG] = ANDROID_LOG_DEBUG, [SRD_LOG_DBG] = ANDROID_LOG_DEBUG,
[SRD_LOG_SPEW] = ANDROID_LOG_VERBOSE, [SRD_LOG_SPEW] = ANDROID_LOG_VERBOSE,
}; };
va_list args2;
int ret; int ret;
/* This specific log callback doesn't need the void pointer data. */ /* This specific log callback doesn't need the void pointer data. */
(void)cb_data; (void)cb_data;
/* Call the previously registered log callback (library's default). */
va_copy(args2, args);
if (prev_srd_log_cb)
prev_srd_log_cb(prev_srd_log_cb_data, loglevel, format, args2);
va_end(args2);
/* Only output messages of at least the selected loglevel(s). */ /* Only output messages of at least the selected loglevel(s). */
if (loglevel > srd_log_loglevel_get()) if (loglevel > srd_log_loglevel_get())
return SRD_OK; return SRD_OK;
@ -94,8 +116,10 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
void AndroidLogHandler::install_callbacks() void AndroidLogHandler::install_callbacks()
{ {
sr_log_callback_get(&prev_sr_log_cb, &prev_sr_log_cb_data);
sr_log_callback_set(sr_callback, nullptr); sr_log_callback_set(sr_callback, nullptr);
#ifdef ENABLE_DECODE #ifdef ENABLE_DECODE
srd_log_callback_get(&prev_srd_log_cb, &prev_srd_log_cb_data);
srd_log_callback_set(srd_callback, nullptr); srd_log_callback_set(srd_callback, nullptr);
#endif #endif
} }