summaryrefslogtreecommitdiff
path: root/gnuradio-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-runtime')
-rw-r--r--gnuradio-runtime/include/gnuradio/block_gateway.h10
-rw-r--r--gnuradio-runtime/include/gnuradio/logger.h126
-rw-r--r--gnuradio-runtime/lib/buffer.cc4
-rw-r--r--gnuradio-runtime/lib/local_sighandler.cc2
-rw-r--r--gnuradio-runtime/lib/logger.cc5
-rw-r--r--gnuradio-runtime/lib/prefs.cc3
-rw-r--r--gnuradio-runtime/lib/sys_paths.cc5
-rw-r--r--gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc9
-rw-r--r--gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc7
9 files changed, 82 insertions, 89 deletions
diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h
index 7756841a3a..daeed75cfb 100644
--- a/gnuradio-runtime/include/gnuradio/block_gateway.h
+++ b/gnuradio-runtime/include/gnuradio/block_gateway.h
@@ -150,15 +150,15 @@ public:
return gr::block::set_min_output_buffer(size);
}
- long block__max_output_buffer(size_t i) {
- return gr::block::max_output_buffer(i);
- }
+ long block__max_output_buffer(size_t i) { return gr::block::max_output_buffer(i); }
- void block__set_max_output_buffer(long max_output_buffer) {
+ void block__set_max_output_buffer(long max_output_buffer)
+ {
gr::block::set_max_output_buffer(max_output_buffer);
}
- void block__set_max_output_buffer(int port, long max_output_buffer) {
+ void block__set_max_output_buffer(int port, long max_output_buffer)
+ {
gr::block::set_max_output_buffer(port, max_output_buffer);
}
diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h
index 138fb004de..83c1f070bf 100644
--- a/gnuradio-runtime/include/gnuradio/logger.h
+++ b/gnuradio-runtime/include/gnuradio/logger.h
@@ -167,136 +167,136 @@ typedef log4cpp::Category* logger_ptr;
#define GR_RESET_CONFIGURATION() gr::logger_config::reset_config();
/* Logger name referenced macros */
-#define GR_DEBUG(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_DEBUG(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::DEBUG << (msg) << log4cpp::eol; \
}
-#define GR_INFO(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_INFO(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::INFO << (msg) << log4cpp::eol; \
}
#define GR_NOTICE(name, msg) \
{ \
gr::logger_ptr logger = gr::logger_get_logger(name); \
- *logger << log4cpp::Priority::NOTICE << (msg); \
+ *logger << log4cpp::Priority::NOTICE << (msg); \
}
-#define GR_WARN(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_WARN(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::WARN << (msg) << log4cpp::eol; \
}
-#define GR_ERROR(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_ERROR(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \
}
-#define GR_CRIT(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_CRIT(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::CRIT << (msg) << log4cpp::eol; \
}
-#define GR_ALERT(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_ALERT(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::ALERT << (msg) << log4cpp::eol; \
}
-#define GR_FATAL(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_FATAL(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::FATAL << (msg) << log4cpp::eol; \
}
-#define GR_EMERG(name, msg) \
- { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_EMERG(name, msg) \
+ { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \
}
-#define GR_ERRORIF(name, cond, msg) \
- { \
- if ((cond)) { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_ERRORIF(name, cond, msg) \
+ { \
+ if ((cond)) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \
- } \
+ } \
}
-#define GR_ASSERT(name, cond, msg) \
- { \
- if (!(cond)) { \
- gr::logger_ptr logger = gr::logger_get_logger(name); \
+#define GR_ASSERT(name, cond, msg) \
+ { \
+ if (!(cond)) { \
+ gr::logger_ptr logger = gr::logger_get_logger(name); \
*logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \
- } \
- assert(0); \
+ } \
+ assert(0); \
}
/* LoggerPtr Referenced Macros */
-#define GR_LOG_DEBUG(logger, msg) \
- { \
+#define GR_LOG_DEBUG(logger, msg) \
+ { \
*logger << log4cpp::Priority::DEBUG << (msg) << log4cpp::eol; \
}
-#define GR_LOG_INFO(logger, msg) \
- { \
+#define GR_LOG_INFO(logger, msg) \
+ { \
*logger << log4cpp::Priority::INFO << (msg) << log4cpp::eol; \
}
-#define GR_LOG_NOTICE(logger, msg) \
- { \
+#define GR_LOG_NOTICE(logger, msg) \
+ { \
*logger << log4cpp::Priority::NOTICE << (msg) << log4cpp::eol; \
}
-#define GR_LOG_WARN(logger, msg) \
- { \
+#define GR_LOG_WARN(logger, msg) \
+ { \
*logger << log4cpp::Priority::WARN << (msg) << log4cpp::eol; \
}
-#define GR_LOG_ERROR(logger, msg) \
- { \
+#define GR_LOG_ERROR(logger, msg) \
+ { \
*logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \
}
-#define GR_LOG_CRIT(logger, msg) \
- { \
+#define GR_LOG_CRIT(logger, msg) \
+ { \
*logger << log4cpp::Priority::CRIT << (msg) << log4cpp::eol; \
}
-#define GR_LOG_ALERT(logger, msg) \
- { \
+#define GR_LOG_ALERT(logger, msg) \
+ { \
*logger << log4cpp::Priority::ALERT << (msg) << log4cpp::eol; \
}
-#define GR_LOG_FATAL(logger, msg) \
- { \
+#define GR_LOG_FATAL(logger, msg) \
+ { \
*logger << log4cpp::Priority::FATAL << (msg) << log4cpp::eol; \
}
-#define GR_LOG_EMERG(logger, msg) \
- { \
+#define GR_LOG_EMERG(logger, msg) \
+ { \
*logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \
}
-#define GR_LOG_ERRORIF(logger, cond, msg) \
- { \
- if ((cond)) { \
+#define GR_LOG_ERRORIF(logger, cond, msg) \
+ { \
+ if ((cond)) { \
*logger << log4cpp::Priority::ERROR << (msg) << log4cpp::eol; \
- } \
+ } \
}
-#define GR_LOG_ASSERT(logger, cond, msg) \
- { \
- if (!(cond)) { \
+#define GR_LOG_ASSERT(logger, cond, msg) \
+ { \
+ if (!(cond)) { \
*logger << log4cpp::Priority::EMERG << (msg) << log4cpp::eol; \
- assert(0); \
- } \
+ assert(0); \
+ } \
}
namespace gr {
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index 77c761085b..13f0a8c78b 100644
--- a/gnuradio-runtime/lib/buffer.cc
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -341,11 +341,11 @@ void buffer_reader::get_tags_in_range(std::vector<tag_t>& v,
uint64_t lower_bound = abs_start - d_attr_delay;
// check for underflow and if so saturate at 0
if (lower_bound > abs_start)
- lower_bound = 0;
+ lower_bound = 0;
uint64_t upper_bound = abs_end - d_attr_delay;
// check for underflow and if so saturate at 0
if (upper_bound > abs_end)
- upper_bound = 0;
+ upper_bound = 0;
v.clear();
std::multimap<uint64_t, tag_t>::iterator itr =
diff --git a/gnuradio-runtime/lib/local_sighandler.cc b/gnuradio-runtime/lib/local_sighandler.cc
index 7f96b2460d..ca16fe05e6 100644
--- a/gnuradio-runtime/lib/local_sighandler.cc
+++ b/gnuradio-runtime/lib/local_sighandler.cc
@@ -27,8 +27,8 @@
#include "local_sighandler.h"
#include <stdio.h>
#include <string.h>
-#include <stdexcept>
#include <boost/format.hpp>
+#include <stdexcept>
namespace gr {
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index 6b1ce7939b..63138851ee 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -263,10 +263,7 @@ void logger_add_file_appender(logger_ptr logger,
{
log4cpp::PatternLayout* layout = new log4cpp::PatternLayout();
log4cpp::Appender* app =
- new log4cpp::FileAppender(
- "FileAppender::" + filename,
- filename,
- append);
+ new log4cpp::FileAppender("FileAppender::" + filename, filename, append);
layout->setConversionPattern(pattern);
app->setLayout(layout);
logger->setAppender(app);
diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc
index 777d64211f..4173973c2e 100644
--- a/gnuradio-runtime/lib/prefs.cc
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -102,7 +102,8 @@ void prefs::_read_files(const std::vector<std::string>& filenames)
section = "default";
key = okey;
}
- std::transform(section.begin(), section.end(), section.begin(), ::tolower);
+ std::transform(
+ section.begin(), section.end(), section.begin(), ::tolower);
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
// value of a basic_option is always a std::vector<string>; we only
// allow single values, so:
diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc
index 2f26724e7c..b9c3fc964f 100644
--- a/gnuradio-runtime/lib/sys_paths.cc
+++ b/gnuradio-runtime/lib/sys_paths.cc
@@ -73,12 +73,11 @@ std::string __userconf_path()
boost::filesystem::path p;
if (path) {
p = path;
- }
- else {
+ } else {
p = appdata_path();
p = p / ".gnuradio";
}
-
+
return p.string();
}
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
index 7d63dc08d1..da71aafc52 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc
@@ -74,8 +74,8 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size)
// Where the "portable format" doesn't work, we try building
// a full filesystem pathname pointing into a suitable temporary directory.
- seg_name = str(boost::format("%s/gnuradio-%d-%d") %
- gr::tmp_path() % getpid() % s_seg_counter);
+ seg_name = str(boost::format("%s/gnuradio-%d-%d") % gr::tmp_path() %
+ getpid() % s_seg_counter);
}
shm_fd = shm_open(seg_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
@@ -91,9 +91,8 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size)
EEXIST) // Named segment already exists (shouldn't happen). Try again
continue;
- static std::string msg =
- str(boost::format("gr::vmcircbuf_mmap_shm_open: shm_open [%s]") %
- seg_name);
+ static std::string msg = str(
+ boost::format("gr::vmcircbuf_mmap_shm_open: shm_open [%s]") % seg_name);
perror(msg.c_str());
throw std::runtime_error("gr::vmcircbuf_mmap_shm_open");
}
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
index f6c1777013..f7fd5e3d35 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
@@ -65,11 +65,8 @@ vmcircbuf_mmap_tmpfile::vmcircbuf_mmap_tmpfile(int size) : gr::vmcircbuf(size)
// open a temporary file that we'll map in a bit later
while (1) {
- seg_name = str(boost::format(
- "%s/gnuradio-%d-%d-XXXXXX") %
- gr::tmp_path() %
- getpid() %
- s_seg_counter);
+ seg_name = str(boost::format("%s/gnuradio-%d-%d-XXXXXX") % gr::tmp_path() %
+ getpid() % s_seg_counter);
s_seg_counter++;
seg_fd = open(seg_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 01:45:19 +0000