summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-06-29 22:02:09 -0400
committerTom Rondeau <tom@trondeau.com>2014-06-29 22:02:09 -0400
commit830d0eff61ae2d5895cfa73a50a31e73da76411a (patch)
treeed51e736239dda21ea7c8385a568f787008b0530 /gnuradio-runtime/lib
parent9a7222577bc5425b17b513b94e0de73e847bd9da (diff)
parent0ae33fc67a7655b63a6384a1898319b7cc2c5bf6 (diff)
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/lib')
-rw-r--r--gnuradio-runtime/lib/block.cc12
-rw-r--r--gnuradio-runtime/lib/logger.cc15
-rw-r--r--gnuradio-runtime/lib/tpb_thread_body.cc40
3 files changed, 41 insertions, 26 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index e5217dbfce..6309bca9b1 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -77,13 +77,13 @@ namespace gr {
GR_LOG_SET_LEVEL(LOG, log_level);
if(log_file.size() > 0) {
if(log_file == "stdout") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
}
else if(log_file == "stderr") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
}
else {
- GR_LOG_ADD_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
+ GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
}
}
d_logger = LOG;
@@ -92,13 +92,13 @@ namespace gr {
GR_LOG_SET_LEVEL(DLOG, debug_level);
if(debug_file.size() > 0) {
if(debug_file == "stdout") {
- GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cout","gr::debug :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(DLOG, "cout","gr::debug :%p: %c{1} - %m%n");
}
else if(debug_file == "stderr") {
- GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "cerr", "gr::debug :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(DLOG, "cerr", "gr::debug :%p: %c{1} - %m%n");
}
else {
- GR_LOG_ADD_FILE_APPENDER(DLOG, debug_file, true, "%r :%p: %c{1} - %m%n");
+ GR_LOG_SET_FILE_APPENDER(DLOG, debug_file, true, "%r :%p: %c{1} - %m%n");
}
}
d_debug_logger = DLOG;
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index a7e4a25a40..c11f384cc6 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -254,6 +254,13 @@ namespace gr {
}
void
+ logger_set_console_appender(logger_ptr logger, std::string target, std::string pattern)
+ {
+ logger->removeAllAppenders();
+ logger_add_console_appender(logger, target, pattern);
+ }
+
+ void
logger_add_file_appender(logger_ptr logger, std::string filename,
bool append, std::string pattern)
{
@@ -267,6 +274,14 @@ namespace gr {
}
void
+ logger_set_file_appender(logger_ptr logger, std::string filename,
+ bool append, std::string pattern)
+ {
+ logger->removeAllAppenders();
+ logger_add_file_appender(logger, filename, append, pattern);
+ }
+
+ void
logger_add_rollingfile_appender(logger_ptr logger, std::string filename,
size_t filesize, int bkup_index, bool append,
mode_t mode, std::string pattern)
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc
index eb47a43ee3..d2f0fce833 100644
--- a/gnuradio-runtime/lib/tpb_thread_body.cc
+++ b/gnuradio-runtime/lib/tpb_thread_body.cc
@@ -36,7 +36,7 @@ namespace gr {
: d_exec(block, max_noutput_items)
{
//std::cerr << "tpb_thread_body: " << block << std::endl;
-
+
thread::set_thread_name(pthread_self(), boost::str(boost::format("%s%d") % block->name() % block->unique_id()));
block_detail *d = block->detail().get();
@@ -61,13 +61,13 @@ namespace gr {
GR_CONFIG_LOGGER(config_file);
if(log_file.size() > 0) {
if(log_file == "stdout") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(LOG, "cout","gr::log :%p: %c{1} - %m%n");
}
else if(log_file == "stderr") {
- GR_LOG_ADD_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
+ GR_LOG_SET_CONSOLE_APPENDER(LOG, "cerr","gr::log :%p: %c{1} - %m%n");
}
else {
- GR_LOG_ADD_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
+ GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n");
}
}
#endif /* HAVE_LOG4CPP */
@@ -83,7 +83,7 @@ namespace gr {
if(block->thread_priority() > 0) {
gr::thread::set_thread_priority(d->thread, block->thread_priority());
}
-
+
// make sure our block isnt finished
block->clear_finished();
@@ -107,7 +107,7 @@ namespace gr {
if(block->nmsgs(i.first) > max_nmsgs){
GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
msg = block->delete_head_nowait(i.first);
- }
+ }
}
}
@@ -154,19 +154,19 @@ namespace gr {
// handle all pending messages
BOOST_FOREACH(basic_block::msg_queue_map_t::value_type &i, block->msg_queue) {
if(block->has_msg_handler(i.first)) {
- while((msg = block->delete_head_nowait(i.first))) {
- guard.unlock(); // release lock while processing msg
- block->dispatch_msg(i.first, msg);
- guard.lock();
- }
+ while((msg = block->delete_head_nowait(i.first))) {
+ guard.unlock(); // release lock while processing msg
+ block->dispatch_msg(i.first, msg);
+ guard.lock();
+ }
}
else {
- // leave msg in queue if no handler is defined
- // start dropping if we have too many
- if(block->nmsgs(i.first) > max_nmsgs){
- GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
- msg = block->delete_head_nowait(i.first);
- }
+ // leave msg in queue if no handler is defined
+ // start dropping if we have too many
+ if(block->nmsgs(i.first) > max_nmsgs){
+ GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
+ msg = block->delete_head_nowait(i.first);
+ }
}
}
if (d->done()) {
@@ -197,11 +197,11 @@ namespace gr {
// leave msg in queue if no handler is defined
// start dropping if we have too many
if(block->nmsgs(i.first) > max_nmsgs){
- GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
- msg = block->delete_head_nowait(i.first);
- }
+ GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
+ msg = block->delete_head_nowait(i.first);
}
}
+ }
}
}
break;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 00:46:30 +0000