Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

update: 'libsigrokdecode4DS' project used new log lib

Browse Source
This commit is contained in:
dreamsourcelabTAI 2022-07-12 19:03:50 +08:00
parent f2f777bf9a
commit 17da360d6d
25 changed files with 181 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DSView/main.cpp
View File

@ -150,8 +150,8 @@ int main(int argc, char *argv[])
}
#ifdef DEBUG_INFO
if (XLOG_LEVEL_DBG > logLevel){
dsv_log_level(XLOG_LEVEL_DBG); // on develop mode, set the default log ldevel
if (XLOG_LEVEL_INFO > logLevel){
dsv_log_level(XLOG_LEVEL_INFO); // on develop mode, set the default log ldevel
}
#endif
@ -195,7 +195,7 @@ bool bHighScale = true;
//----------------------run
dsv_info("----------------- version: %s-----------------", DS_VERSION_STRING);
dsv_dbg("Qt:%s", QT_VERSION_STR);
dsv_info("Qt:%s", QT_VERSION_STR);
AppControl *control = AppControl::Instance();
AppConfig::Instance().LoadAll(); //load app config

5
DSView/pv/appcontrol.cpp
View File

@ -69,6 +69,7 @@ void AppControl::Destroy(){
bool AppControl::Init()
{
sr_log_set_context(dsv_log_context());
srd_log_set_context(dsv_log_context());
// Initialise libsigrok
if (sr_init(&sr_ctx) != SR_OK)
@ -81,8 +82,6 @@ bool AppControl::Init()
QString resdir = GetResourceDir();
sr_set_firmware_resource_dir(resdir.toUtf8().data());
#ifdef _WIN32
//able run debug with qtcreator
QString pythonHome = "c:/python";
@ -99,7 +98,7 @@ bool AppControl::Init()
QString dir = GetDecodeScriptDir();
strcpy(path, dir.toUtf8().data());
dsv_dbg("decode script path: \"%s\"", dir.toUtf8().data());
dsv_info("decode script path: \"%s\"", dir.toUtf8().data());
// Initialise libsigrokdecode
if (srd_init(path) != SRD_OK)

6
DSView/pv/data/decoderstack.cpp
View File

@ -508,7 +508,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
//struct srd_push_param push_param;
if( i >= decode_end){
dsv_dbg("%s", "decode data index have been end");
dsv_info("%s", "decode data index have been end");
}
while(i < decode_end && !_no_memory && !status->_bStop)
@ -580,7 +580,7 @@ void DecoderStack::decode_data(const uint64_t decode_start, const uint64_t decod
_error_message = QString::fromLocal8Bit(error);
}
dsv_dbg("%s%llu", "send to decoder times:", entry_cnt);
dsv_info("%s%llu", "send to decoder times: ", entry_cnt);
if (error)
g_free(error);
@ -608,7 +608,7 @@ void DecoderStack::execute_decode_stack()
// Get the intial sample count
_sample_count = _snapshot->get_sample_count();
dsv_dbg("%s%llu", "decoder sample count:", _sample_count);
dsv_info("%s%llu", "decoder sample count: ", _sample_count);
// Create the decoders
for(auto &dec : _stack)

4
DSView/pv/device/devinst.cpp
View File

@ -199,12 +199,12 @@ void DevInst::start()
void DevInst::run()
{
dsv_dbg("%s", "session run loop start");
dsv_info("%s", "session run loop start");
int ret = sr_session_run();
if (ret != SR_OK){
dsv_err("%s", "start session error!");
}
dsv_dbg("%s", "session run loop end");
dsv_info("%s", "session run loop end");
}
void DevInst::stop()

4
DSView/pv/dock/protocoldock.cpp
View File

@ -362,12 +362,12 @@ void ProtocolDock::on_add_protocol()
bool ProtocolDock::add_protocol_by_id(QString id, bool silent, std::list<pv::data::decode::Decoder*> &sub_decoders)
{
if (_session->is_device_re_attach() == true){
dsv_dbg("%s", "Keep current decoders, cancel add new.");
dsv_info("%s", "Keep current decoders, cancel add new.");
return true;
}
if (_session->get_device()->dev_inst()->mode != LOGIC) {
dsv_dbg("%s", "Protocol Analyzer\nProtocol Analyzer is only valid in Digital Mode!");
dsv_info("%s", "Protocol Analyzer\nProtocol Analyzer is only valid in Digital Mode!");
return false;
}

4
DSView/pv/log.cpp
View File

@ -52,7 +52,7 @@ xlog_context* dsv_log_context()
void dsv_log_level(int l)
{
xlog_set_level(log_ctx, l);
dsv_dbg("%s%d", "set log level: ", l);
dsv_info("%s%d", "set log level: ", l);
}
void dsv_log_enalbe_logfile()
@ -70,6 +70,6 @@ void dsv_log_enalbe_logfile()
xlog_add_receiver_from_file(log_ctx, lf.toUtf8().data(), 0);
dsv_dbg("%s\"%s\"", "store log to file: ", lf.toUtf8().data());
dsv_info("%s\"%s\"", "store log to file: ", lf.toUtf8().data());
}
}

6
DSView/pv/mainwindow.cpp
View File

@ -445,7 +445,7 @@ void MainWindow::update_device_list()
if (ldFileName != ""){
if (QFile::exists(ldFileName)){
dsv_dbg("auto load file:%s", ldFileName.toUtf8().data());
dsv_info("auto load file:%s", ldFileName.toUtf8().data());
on_load_file(ldFileName);
}
else{
@ -976,7 +976,7 @@ bool MainWindow::load_session_json(QJsonDocument json, bool file_dev, bool bDeco
}
if (sessionObj["Version"].toInt() < BASE_SESSION_VERSION){
dsv_dbg("%s", "session file version is error!");
dsv_err("%s", "session file version is error!");
return false;
}
@ -1459,7 +1459,7 @@ void MainWindow::switchLanguage(int language)
retranslateUi();
}
else{
dsv_dbg("%s%d", "Unknown language code:", language);
dsv_err("%s%d", "Unknown language code:", language);
}
}

24
DSView/pv/sigsession.cpp
View File

@ -168,9 +168,9 @@ void SigSession::set_device(DevInst *dev_inst)
}
if (_dev_inst->is_file())
dsv_dbg("%s\"%s\"", "Switch to file: ", dev_name.toUtf8().data());
dsv_info("%s\"%s\"", "Switch to file: ", dev_name.toUtf8().data());
else
dsv_dbg("%s\"%s\"", "Switch to device: ", dev_name.toUtf8().data());
dsv_info("%s\"%s\"", "Switch to device: ", dev_name.toUtf8().data());
try {
_dev_inst->use(this);
@ -439,7 +439,7 @@ void SigSession::start_capture(bool instant)
{
// Check that a device instance has been selected.
if (!_dev_inst) {
dsv_dbg("%s", "No device selected");
dsv_err("%s", "No device selected");
capture_state_changed(SigSession::Stopped);
return;
}
@ -709,7 +709,7 @@ void SigSession::init_signals()
clear_all_decoder();
}
else{
dsv_dbg("%s", "Device loose contact");
dsv_err("%s", "Device loose contact");
}
// Detect what data types we will receive
@ -1265,7 +1265,7 @@ void SigSession::hotplug_proc()
if (!_dev_inst)
return;
dsv_dbg("%s", "Hotplug thread start!");
dsv_info("%s", "Hotplug thread start!");
try {
while(_session && !_bHotplugStop) {
@ -1273,12 +1273,12 @@ void SigSession::hotplug_proc()
sr_hotplug_wait_timout(_sr_ctx);
if (_hot_attach) {
dsv_dbg("%s", "process event: DreamSourceLab hardware attached!");
dsv_info("%s", "process event: DreamSourceLab hardware attached!");
_callback->device_attach();
_hot_attach = false;
}
if (_hot_detach) {
dsv_dbg("%s", "process event: DreamSourceLab hardware detached!");
dsv_info("%s", "process event: DreamSourceLab hardware detached!");
_callback->device_detach();
_hot_detach = false;
}
@ -1300,7 +1300,7 @@ void SigSession::hotplug_proc()
dsv_err("%s", "Interrupt exception for hotplug thread was thrown.");
}
dsv_dbg("%s", "Hotplug thread exit!");
dsv_info("%s", "Hotplug thread exit!");
}
void SigSession::register_hotplug_callback()
@ -1884,7 +1884,7 @@ void SigSession::set_stop_scale(float scale)
if ((*it) == trace){
(*it)->decoder()->stop_decode_work();
_decode_tasks.erase(it);
dsv_dbg("%s", "remove a waiting decode task");
dsv_info("%s", "remove a waiting decode task");
return;
}
}
@ -1973,7 +1973,7 @@ void SigSession::set_stop_scale(float scale)
//the decode task thread proc
void SigSession::decode_task_proc()
{
dsv_dbg("%s", "------->decode thread start");
dsv_info("%s", "------->decode thread start");
auto task = get_top_decode_task();
while (task != NULL)
@ -1983,7 +1983,7 @@ void SigSession::set_stop_scale(float scale)
}
if (task->_delete_flag){
dsv_dbg("%s", "destroy a decoder in task thread");
dsv_info("%s", "destroy a decoder in task thread");
DESTROY_QT_LATER(task);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
@ -1995,7 +1995,7 @@ void SigSession::set_stop_scale(float scale)
task = get_top_decode_task();
}
dsv_dbg("%s", "------->decode thread end");
dsv_info("%s", "------->decode thread end");
_bDecodeRunning = false;
}

2
libsigrok4DSL/hardware/DSL/dscope.c
View File

@ -283,7 +283,7 @@ static GSList *scan(GSList *options)
if (dsl_check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */
sr_dbg("Found an DSCope device.");
sr_info("Found an DSCope device.");
sdi->status = SR_ST_INACTIVE;
sdi->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),

2
libsigrok4DSL/hardware/DSL/dslogic.c
View File

@ -352,7 +352,7 @@ static GSList *scan(GSList *options)
if (dsl_check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */
sr_dbg("Found an DSLogic device.");
sr_info("Found an DSLogic device.");
sdi->status = SR_ST_INACTIVE;
sdi->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),

10
libsigrok4DSL/libsigrok.h
View File

@ -133,16 +133,6 @@ enum {
#define MAX_TIMEBASE SR_SEC(10)
#define MIN_TIMEBASE SR_NS(10)
/** libsigrok loglevels. */
enum {
SR_LOG_NONE = 0, /**< Output no messages at all. */
SR_LOG_ERR = 1, /**< Output error messages. */
SR_LOG_WARN = 2, /**< Output warnings. */
SR_LOG_INFO = 3, /**< Output informational messages. */
SR_LOG_DBG = 4, /**< Output debug messages. */
SR_LOG_SPEW = 5, /**< Output very noisy debug messages. */
};
/*
* Use SR_API to mark public API symbols, and SR_PRIV for private symbols.
*

4
libsigrok4DSL/log.c
View File

@ -25,8 +25,8 @@
xlog_writer *sr_log = 0;
static xlog_context *log_ctx = 0; //private log context
int is_private_log = 0;
int log_level_value = -1;
static int is_private_log = 0;
static int log_level_value = -1;
/**
* Init a private log context

4
libsigrok4DSL/session.c
View File

@ -362,7 +362,7 @@ SR_API int sr_session_start(void)
return SR_ERR_BUG;
}
sr_dbg("Starting...");
sr_info("Starting...");
ret = SR_OK;
for (l = session->devs; l; l = l->next) {
@ -461,7 +461,7 @@ SR_PRIV int sr_session_stop_sync(void)
return SR_ERR_BUG;
}
sr_dbg("Stopping.");
sr_info("Stopping.");
for (l = session->devs; l; l = l->next) {
sdi = l->data;

2
libsigrok4DSL/session_file.c
View File

@ -124,7 +124,7 @@ SR_API int sr_session_load(const char *filename)
kf = g_key_file_new();
if (!g_key_file_load_from_data(kf, metafile, fileInfo.uncompressed_size, 0, NULL)) {
sr_dbg("Failed to parse metadata.");
sr_err("Failed to parse metadata.");
return SR_ERR;
}

1
libsigrokdecode4DSL/decoder.c
View File

@ -23,6 +23,7 @@
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
#include <glib.h>
#include "log.h"
/**
* @file

5
libsigrokdecode4DSL/exception.c
View File

@ -22,6 +22,7 @@
#include "libsigrokdecode.h"
#include <stdarg.h>
#include <glib.h>
#include "log.h"
static char *py_stringify(PyObject *py_obj)
{
@ -48,7 +49,7 @@ cleanup:
Py_XDECREF(py_str);
if (!str) {
PyErr_Clear();
srd_dbg("Failed to stringify object.");
srd_err("Failed to stringify object.");
}
return str;
@ -79,7 +80,7 @@ cleanup:
Py_XDECREF(py_str);
if (!str) {
PyErr_Clear();
srd_dbg("Failed to get object attribute %s.", attr);
srd_err("Failed to get object attribute %s.", attr);
}
return str;

4
libsigrokdecode4DSL/instance.c
View File

@ -27,6 +27,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <assert.h>
#include "log.h"
/** @cond PRIVATE */
@ -1130,8 +1131,7 @@ static gpointer di_thread(gpointer data)
srd_dbg("%s: decode() terminated (req %d).", di->inst_id, wanted_term);
PyErr_Clear();
PyGILState_Release(gstate);
//srd_dbg("%s: Thread done (with res).", di->inst_id);
PyGILState_Release(gstate);
return NULL;
}

16
libsigrokdecode4DSL/libsigrokdecode-internal.h
View File

@ -82,19 +82,11 @@ SRD_PRIV void srd_inst_free_all(struct srd_session *sess);
* On MinGW, we need to specify the gnu_printf format flavor or GCC
* will assume non-standard Microsoft printf syntax.
*/
SRD_PRIV int srd_log(int loglevel, const char *format, ...)
__attribute__((__format__ (__gnu_printf__, 2, 3)));
//SRD_PRIV int srd_log(int loglevel, const char *format, ...)
// __attribute__((__format__ (__gnu_printf__, 2, 3)));
#else
SRD_PRIV int srd_log(int loglevel, const char *format, ...) G_GNUC_PRINTF(2, 3);
#endif
#define srd_spew(...) srd_log(SRD_LOG_SPEW, __VA_ARGS__)
#define srd_dbg(...) srd_log(SRD_LOG_DBG, __VA_ARGS__)
#define srd_info(...) srd_log(SRD_LOG_INFO, __VA_ARGS__)
#define srd_warn(...) srd_log(SRD_LOG_WARN, __VA_ARGS__)
#define srd_err(...) srd_log(SRD_LOG_ERR, __VA_ARGS__)
SRD_PRIV void debug_log(const char *str);
//SRD_PRIV int srd_log(int loglevel, const char *format, ...) G_GNUC_PRINTF(2, 3);
#endif
/* decoder.c */
SRD_PRIV long srd_decoder_apiver(const struct srd_decoder *d);

27
libsigrokdecode4DSL/libsigrokdecode.h
View File

@ -24,6 +24,7 @@
#include <stdint.h>
#include <glib.h>
#include <common/log/xlog.h>
#define DECODE_NUM_HEX_MAX_LEN 35
@ -93,16 +94,6 @@ enum srd_error_code {
*/
};
/* libsigrokdecode loglevels. */
enum srd_loglevel {
SRD_LOG_NONE = 0, /**< Output no messages at all. */
SRD_LOG_ERR = 1, /**< Output error messages. */
SRD_LOG_WARN = 2, /**< Output warnings. */
SRD_LOG_INFO = 3, /**< Output informational messages. */
SRD_LOG_DBG = 4, /**< Output debug messages. */
SRD_LOG_SPEW = 5, /**< Output very noisy debug messages. */
};
/*
* Use SRD_API to mark public API symbols, and SRD_PRIV for private symbols.
*
@ -418,13 +409,15 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di,
GArray *initial_pins);
/* log.c */
typedef int (*srd_log_callback)(void *cb_data, int loglevel,
const char *format, va_list args);
SRD_API int srd_log_loglevel_set(int loglevel);
SRD_API int srd_log_loglevel_get(void);
SRD_API int srd_log_callback_get(srd_log_callback *cb, void **cb_data);
SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data);
SRD_API int srd_log_callback_set_default(void);
/**
* Use a shared context, and drop the private log context
*/
SRD_API void srd_log_set_context(xlog_context *ctx);
/**
* Set the private log context level
*/
SRD_API void srd_log_level(int level);
/* error.c */
SRD_API const char *srd_strerror(int error_code);

238
libsigrokdecode4DSL/log.c
View File

@ -1,7 +1,8 @@
/*
* This file is part of the libsigrokdecode project.
*
* Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
* This file is part of the DSView project.
* DSView is based on PulseView.
*
* Copyright (C) 2022 DreamSourceLab <support@dreamsourcelab.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,207 +15,72 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "log.h"
#include "config.h"
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
#include <stdarg.h>
#include <stdio.h>
#include <glib/gprintf.h>
#define LOG_DOMAIN "srd"
xlog_writer *srd_log = 0;
static xlog_context *log_ctx = 0; //private log context
static int is_private_log = 0;
static int log_level_value = -1;
/**
* @file
*
* Controlling the libsigrokdecode message logging functionality.
* Init a private log context
*/
/**
* @defgroup grp_logging Logging
*
* Controlling the libsigrokdecode message logging functionality.
*
* @{
*/
/* Currently selected libsigrokdecode loglevel. Default: SRD_LOG_WARN. */
static int cur_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
/* Function prototype. */
static int srd_logv(void *cb_data, int loglevel, const char *format,
va_list args);
/* Pointer to the currently selected log callback. Default: srd_logv(). */
static srd_log_callback srd_log_cb = srd_logv;
/*
* Pointer to private data that can be passed to the log callback.
* This can be used (for example) by C++ GUIs to pass a "this" pointer.
*/
static void *srd_log_cb_data = NULL;
/**
* Set the libsigrokdecode loglevel.
*
* This influences the amount of log messages (debug messages, error messages,
* and so on) libsigrokdecode will output. Using SRD_LOG_NONE disables all
* messages.
*
* Note that this function itself will also output log messages. After the
* loglevel has changed, it will output a debug message with SRD_LOG_DBG for
* example. Whether this message is shown depends on the (new) loglevel.
*
* @param loglevel The loglevel to set (SRD_LOG_NONE, SRD_LOG_ERR,
* SRD_LOG_WARN, SRD_LOG_INFO, SRD_LOG_DBG, or SRD_LOG_SPEW).
*
* @return SRD_OK upon success, SRD_ERR_ARG upon invalid loglevel.
*
* @since 0.1.0
*/
SRD_API int srd_log_loglevel_set(int loglevel)
SRD_PRIV void srd_log_init()
{
if (loglevel < SRD_LOG_NONE || loglevel > SRD_LOG_SPEW) {
srd_err("Invalid loglevel %d.", loglevel);
return SRD_ERR_ARG;
}
if (!log_ctx && !srd_log){
log_ctx = xlog_new();
srd_log = xlog_create_writer(log_ctx, LOG_DOMAIN);
is_private_log = 1;
cur_loglevel = loglevel;
srd_dbg("libsigrokdecode loglevel set to %d.", loglevel);
return SRD_OK;
if (log_level_value != -1){
xlog_set_level(log_ctx, log_level_value);
}
}
}
/**
* Get the libsigrokdecode loglevel.
*
* @return The currently configured libsigrokdecode loglevel.
*
* @since 0.1.0
* Destroy the private log context
*/
SRD_API int srd_log_loglevel_get(void)
SRD_PRIV void srd_log_uninit()
{
return cur_loglevel;
if (is_private_log && log_ctx){
xlog_free(log_ctx);
log_ctx = 0;
xlog_free_writer(srd_log);
srd_log = 0;
is_private_log = 0;
}
}
/**
* Set the libsigrokdecode log callback to the specified function.
*
* @param cb Function pointer to the log callback function to use.
* Must not be NULL.
* @param cb_data Pointer to private data to be passed on. This can be used
* by the caller to pass arbitrary data to the log functions.
* This pointer is only stored or passed on by libsigrokdecode,
* and is never used or interpreted in any way. The pointer
* is allowed to be NULL if the caller doesn't need/want to
* pass any data.
*
* @return SRD_OK upon success, SRD_ERR_ARG upon invalid arguments.
*
* @since 0.3.0
* Use a shared context, and drop the private log context
*/
SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data)
{
if (!cb) {
srd_err("log: %s: cb was NULL", __func__);
return SRD_ERR_ARG;
}
SRD_API void srd_log_set_context(xlog_context *ctx)
{
if (ctx){
srd_log_uninit();
srd_log = xlog_create_writer(ctx, LOG_DOMAIN);
/* Note: 'cb_data' is allowed to be NULL. */
srd_log_cb = cb;
srd_log_cb_data = cb_data;
return SRD_OK;
if (log_level_value != -1){
xlog_set_level(ctx, log_level_value);
}
}
}
/**
* Get the libsigrokdecode log callback routine and callback data.
*
* @param[out] cb Pointer to a function pointer to receive the log callback
* function. Optional, can be NULL.
* @param[out] cb_data Pointer to a void pointer to receive the log callback's
* additional arguments. Optional, can be NULL.
*
* @return SRD_OK upon success.
*
* @since 0.5.2
* Set the private log context level
*/
SRD_API int srd_log_callback_get(srd_log_callback *cb, void **cb_data)
{
if (cb)
*cb = srd_log_cb;
if (cb_data)
*cb_data = srd_log_cb_data;
return SRD_OK;
}
/**
* Set the libsigrokdecode log callback to the default built-in one.
*
* Additionally, the internal 'srd_log_cb_data' pointer is set to NULL.
*
* @return SRD_OK upon success, a (negative) error code otherwise.
*
* @since 0.1.0
*/
SRD_API int srd_log_callback_set_default(void)
{
/*
* Note: No log output in this function, as it should safely work
* even if the currently set log callback is buggy/broken.
*/
srd_log_cb = srd_logv;
srd_log_cb_data = NULL;
return SRD_OK;
}
static int srd_logv(void *cb_data, int loglevel, const char *format,
va_list args)
{
/* This specific log callback doesn't need the void pointer data. */
(void)cb_data;
(void)loglevel;
if (fputs("srd: ", stderr) < 0
|| vfprintf(stderr, format, args) < 0
|| putc('\n', stderr) < 0)
return SRD_ERR;
fflush(stderr);
return SRD_OK;
}
/** @private */
SRD_PRIV int srd_log(int loglevel, const char *format, ...)
{
int ret;
va_list args;
/* Only output messages of at least the selected loglevel(s). */
if (loglevel > cur_loglevel)
return SRD_OK;
va_start(args, format);
ret = srd_log_cb(srd_log_cb_data, loglevel, format, args);
va_end(args);
return ret;
}
/*
*/
void debug_log(const char *str)
{
if (str && *str){
fputs(str, stdout);
fflush(stdout);
}
}
/** @} */
SRD_API void srd_log_level(int level)
{
log_level_value = level;
if (log_ctx)
{
xlog_set_level(log_ctx, level);
}
}

57
libsigrokdecode4DSL/log.h Normal file
View File

@ -0,0 +1,57 @@
/*
* This file is part of the DSView project.
* DSView is based on PulseView.
*
* Copyright (C) 2022 DreamSourceLab <support@dreamsourcelab.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _SRD_LOG_H_
#define _SRD_LOG_H_
#include <common/log/xlog.h>
#include "libsigrokdecode.h"
extern xlog_writer *srd_log;
/**
* Init a private log context
*/
SRD_PRIV void srd_log_init();
/**
* Destroy the private log context
*/
SRD_PRIV void srd_log_uninit();
/**
* Use a shared context, and drop the private log context
*/
SRD_API void srd_log_set_context(xlog_context *ctx);
/**
* Set the private log context level
*/
SRD_API void srd_log_level(int level);
#define LOG_PREFIX ""
#define srd_err(fmt, args...) xlog_err(srd_log, LOG_PREFIX fmt, ## args)
#define srd_warn(fmt, args...) xlog_warn(srd_log, LOG_PREFIX fmt, ## args)
#define srd_info(fmt, args...) xlog_info(srd_log, LOG_PREFIX fmt, ## args)
#define srd_dbg(fmt, args...) xlog_dbg(srd_log, LOG_PREFIX fmt, ## args)
#define srd_detail(fmt, args...) xlog_detail(srd_log, LOG_PREFIX fmt, ## args)
#endif

8
libsigrokdecode4DSL/session.c
View File

@ -23,7 +23,7 @@
#include "libsigrokdecode.h"
#include <inttypes.h>
#include <glib.h>
#include "log.h"
SRD_PRIV int srd_call_sub_decoder_end(struct srd_decoder_inst *di, char **error);
@ -73,7 +73,7 @@ SRD_API int srd_session_new(struct srd_session **sess)
/* Keep a list of all sessions, so we can clean up as needed. */
sessions = g_slist_append(sessions, *sess);
srd_dbg("Creating session %d.", (*sess)->session_id);
srd_info("Creating session %d.", (*sess)->session_id);
return SRD_OK;
}
@ -99,7 +99,7 @@ SRD_API int srd_session_start(struct srd_session *sess, char **error)
if (!sess)
return SRD_ERR_ARG;
srd_dbg("Calling start() of all instances in session %d.", sess->session_id);
srd_info("Calling start() of all instances in session %d.", sess->session_id);
/* Run the start() method of all decoders receiving frontend data. */
ret = SRD_OK;
@ -347,7 +347,7 @@ SRD_API int srd_session_destroy(struct srd_session *sess)
sessions = g_slist_remove(sessions, sess);
g_free(sess);
srd_dbg("Destroyed session %d.", session_id);
srd_info("Destroyed session %d.", session_id);
return SRD_OK;
}

5
libsigrokdecode4DSL/srd.c
View File

@ -22,6 +22,7 @@
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
#include <glib.h>
#include "log.h"
/** @cond PRIVATE */
@ -190,6 +191,8 @@ SRD_API int srd_init(const char *path)
size_t i;
int ret;
const char *env_path;
srd_log_init(); //init log
if (max_session_id != -1) {
srd_err("libsigrokdecode is already initialized.");
@ -310,6 +313,8 @@ SRD_API int srd_exit(void)
max_session_id = -1;
srd_log_uninit(); //uninit log
return SRD_OK;
}

7
libsigrokdecode4DSL/type_decoder.c
View File

@ -23,6 +23,7 @@
#include "libsigrokdecode.h"
#include <inttypes.h>
#include <string.h>
#include "log.h"
/** @cond PRIVATE */
extern SRD_PRIV GSList *sessions;
@ -494,7 +495,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
/* Upon SRD_OUTPUT_PYTHON for stacked PDs, we have a nicer log message later. */
if (pdo->output_type != SRD_OUTPUT_PYTHON && di->next_di != NULL) {
srd_spew("Instance %s put %"PRIu64 "-%" PRIu64 " %s on "
srd_detail("Instance %s put %"PRIu64 "-%" PRIu64 " %s on "
"oid %d (%s).", di->inst_id, start_sample, end_sample,
output_type_name(pdo->output_type), output_id,
pdo->proto_id);
@ -526,7 +527,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
for (l = di->next_di; l; l = l->next) {
next_di = l->data;
srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s "
srd_detail("Instance %s put %" PRIu64 "-%" PRIu64 " %s "
"on oid %d (%s) to instance %s.", di->inst_id,
start_sample,
end_sample, output_type_name(pdo->output_type),
@ -1224,7 +1225,7 @@ static PyObject *Decoder_printlog(PyObject *self, PyObject *args)
}
str = PyBytes_AsString(py_bytes);
debug_log(str);
srd_err("%s", str); //print string from python to console
Py_DECREF(py_bytes);
PyGILState_Release(gstate);

5
libsigrokdecode4DSL/util.c
View File

@ -20,6 +20,7 @@
#include "config.h"
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "log.h"
/**
* Import a Python module by name.
@ -187,7 +188,7 @@ SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
}
if (!(py_value = PyDict_GetItemString(py_obj, key))) {
srd_dbg("Dictionary has no attribute '%s'.", key);
srd_detail("Dictionary has no attribute '%s'.", key);
goto err;
}
@ -225,7 +226,7 @@ SRD_PRIV int py_dictitem_to_int(PyObject *py_obj, const char *key)
}
if (!(py_value = PyDict_GetItemString(py_obj, key))) {
srd_dbg("Dictionary has no attribute '%s'.", key);
srd_detail("Dictionary has no attribute '%s'.", key);
goto err;
}