summaryrefslogtreecommitdiff
path: root/gruel/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gruel/src/lib')
-rw-r--r--gruel/src/lib/.gitignore5
-rw-r--r--gruel/src/lib/CMakeLists.txt8
-rw-r--r--gruel/src/lib/Makefile.am68
-rw-r--r--gruel/src/lib/msg/.gitignore4
-rw-r--r--gruel/src/lib/msg/CMakeLists.txt8
-rw-r--r--gruel/src/lib/msg/Makefile.am33
-rw-r--r--gruel/src/lib/msg/msg_accepter.cc8
-rw-r--r--gruel/src/lib/msg/msg_accepter_msgq.cc8
-rw-r--r--gruel/src/lib/msg/msg_queue.cc14
-rw-r--r--gruel/src/lib/pmt/.gitignore10
-rw-r--r--gruel/src/lib/pmt/CMakeLists.txt19
-rw-r--r--gruel/src/lib/pmt/Makefile.am105
-rw-r--r--gruel/src/lib/pmt/gen-serial-tags.py53
-rwxr-xr-xgruel/src/lib/pmt/generate_unv.py24
-rw-r--r--gruel/src/lib/pmt/pmt-serial-tags.scm75
-rw-r--r--gruel/src/lib/pmt/pmt.cc30
-rw-r--r--gruel/src/lib/pmt/pmt_int.h10
-rw-r--r--gruel/src/lib/pmt/pmt_io.cc14
-rw-r--r--gruel/src/lib/pmt/pmt_pool.cc8
-rw-r--r--gruel/src/lib/pmt/pmt_serialize.cc22
-rw-r--r--gruel/src/lib/pmt/qa_pmt.cc10
-rw-r--r--gruel/src/lib/pmt/qa_pmt.h8
-rw-r--r--gruel/src/lib/pmt/qa_pmt_prims.cc18
-rw-r--r--gruel/src/lib/pmt/qa_pmt_prims.h8
-rw-r--r--gruel/src/lib/pmt/unv_template.cc.t2
-rw-r--r--gruel/src/lib/realtime.cc12
-rw-r--r--gruel/src/lib/sys_pri.cc8
-rw-r--r--gruel/src/lib/test_gruel.cc12
-rw-r--r--gruel/src/lib/thread_body_wrapper.cc10
-rw-r--r--gruel/src/lib/thread_group.cc2
30 files changed, 258 insertions, 358 deletions
diff --git a/gruel/src/lib/.gitignore b/gruel/src/lib/.gitignore
deleted file mode 100644
index 165e179d6..000000000
--- a/gruel/src/lib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-test_gruel
diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt
index a6aa1d992..cd7b7abf4 100644
--- a/gruel/src/lib/CMakeLists.txt
+++ b/gruel/src/lib/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2010-2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio 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 3, or (at your option)
# any later version.
-#
+#
# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am
deleted file mode 100644
index 773f3aefd..000000000
--- a/gruel/src/lib/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright 2008,2009,2010,2011 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio 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 3, or (at your option)
-# any later version.
-#
-# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = pmt msg
-
-AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) \
- $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-TESTS = test_gruel
-
-noinst_PROGRAMS = test_gruel
-
-
-lib_LTLIBRARIES = libgruel.la
-
-# magic flags
-libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS)
-
-# ----------------------------------------------------------------
-
-PMT_LIB = pmt/libpmt.la
-MSG_LIB = msg/libmsg.la
-
-# These are the source files that go into the gruel shared library
-libgruel_la_SOURCES = \
- realtime.cc \
- sys_pri.cc \
- thread_body_wrapper.cc \
- thread_group.cc
-
-libgruel_la_LIBADD = \
- $(BOOST_THREAD_LIB) \
- $(BOOST_SYSTEM_LIB) \
- $(BOOST_FILESYSTEM_LIB) \
- $(PMT_LIB) \
- $(MSG_LIB) \
- -lstdc++
-
-
-# ----------------------------------------------------------------
-
-test_gruel_SOURCES = test_gruel.cc
-test_gruel_LDADD = \
- $(BOOST_THREAD_LIB) \
- $(BOOST_SYSTEM_LIB) \
- $(BOOST_FILESYSTEM_LIB) \
- pmt/libpmt-qa.la libgruel.la
-
diff --git a/gruel/src/lib/msg/.gitignore b/gruel/src/lib/msg/.gitignore
deleted file mode 100644
index c026fd667..000000000
--- a/gruel/src/lib/msg/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
diff --git a/gruel/src/lib/msg/CMakeLists.txt b/gruel/src/lib/msg/CMakeLists.txt
index 116d2c67f..74010af7e 100644
--- a/gruel/src/lib/msg/CMakeLists.txt
+++ b/gruel/src/lib/msg/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2010 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio 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 3, or (at your option)
# any later version.
-#
+#
# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gruel/src/lib/msg/Makefile.am b/gruel/src/lib/msg/Makefile.am
deleted file mode 100644
index 9dbaf10f5..000000000
--- a/gruel/src/lib/msg/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2009,2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio 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 3, or (at your option)
-# any later version.
-#
-# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) \
- $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libmsg.la
-
-libmsg_la_SOURCES = \
- msg_accepter.cc \
- msg_accepter_msgq.cc \
- msg_queue.cc
-
diff --git a/gruel/src/lib/msg/msg_accepter.cc b/gruel/src/lib/msg/msg_accepter.cc
index 64878f737..5acd98aa2 100644
--- a/gruel/src/lib/msg/msg_accepter.cc
+++ b/gruel/src/lib/msg/msg_accepter.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gruel/src/lib/msg/msg_accepter_msgq.cc b/gruel/src/lib/msg/msg_accepter_msgq.cc
index 64fe501d1..2ae3537b8 100644
--- a/gruel/src/lib/msg/msg_accepter_msgq.cc
+++ b/gruel/src/lib/msg/msg_accepter_msgq.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/gruel/src/lib/msg/msg_queue.cc b/gruel/src/lib/msg/msg_queue.cc
index 8d15f08c5..a0b120e40 100644
--- a/gruel/src/lib/msg/msg_queue.cc
+++ b/gruel/src/lib/msg/msg_queue.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -36,12 +36,12 @@ namespace gruel {
{
return msg_queue_sptr(new msg_queue(limit));
}
-
+
msg_queue::msg_queue(unsigned int limit)
: d_limit(limit)
{
}
-
+
msg_queue::~msg_queue()
{
flush();
@@ -83,7 +83,7 @@ namespace gruel {
if (empty_p())
return pmt_t();
-
+
pmt_t m(d_msgs.front());
d_msgs.pop_front();
diff --git a/gruel/src/lib/pmt/.gitignore b/gruel/src/lib/pmt/.gitignore
deleted file mode 100644
index 035c0316b..000000000
--- a/gruel/src/lib/pmt/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/test_pmt
-/qa_pmt_unv.cc
-/qa_pmt_unv.h
-/pmt_unv_int.h
-/pmt_unv.cc
-/stamp-sources-generate
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
index a708fa7ad..dc70f03d7 100644
--- a/gruel/src/lib/pmt/CMakeLists.txt
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2010 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio 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 3, or (at your option)
# any later version.
-#
+#
# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
@@ -26,9 +26,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
########################################################################
# Generate serial tags header file
########################################################################
-get_filename_component(SCHEME_DIR
- ${CMAKE_CURRENT_SOURCE_DIR}/../../scheme/gnuradio ABSOLUTE
-)
get_filename_component(PMT_SERIAL_TAGS_H
${CMAKE_CURRENT_BINARY_DIR}/../../include/gruel/pmt_serial_tags.h ABSOLUTE
@@ -36,11 +33,11 @@ get_filename_component(PMT_SERIAL_TAGS_H
add_custom_command(
OUTPUT ${PMT_SERIAL_TAGS_H}
- DEPENDS ${SCHEME_DIR}/gen-serial-tags.py
- DEPENDS ${SCHEME_DIR}/pmt-serial-tags.scm
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm
COMMAND ${PYTHON_EXECUTABLE}
- ${SCHEME_DIR}/gen-serial-tags.py
- ${SCHEME_DIR}/pmt-serial-tags.scm
+ ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm
${PMT_SERIAL_TAGS_H}
)
diff --git a/gruel/src/lib/pmt/Makefile.am b/gruel/src/lib/pmt/Makefile.am
deleted file mode 100644
index 0c8e12dc3..000000000
--- a/gruel/src/lib/pmt/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright 2008,2009,2010,2011 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio 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 3, or (at your option)
-# any later version.
-#
-# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) \
- $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libpmt.la
-
-# ----------------------------------------------------------------
-# these scripts generate code
-
-code_generator = \
- generate_unv.py \
- unv_template.h.t \
- unv_template.cc.t \
- unv_qa_template.cc.t
-
-GENERATED_H = \
- pmt_unv_int.h \
- qa_pmt_unv.h
-
-GENERATED_CC = \
- pmt_unv.cc \
- qa_pmt_unv.cc
-
-python_built_sources = $(GENERATED_H) $(GENERATED_CC)
-
-PMT_SERIAL_TAGS_H = $(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h
-BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H)
-
-EXTRA_DIST += $(code_generator)
-
-# ----------------------------------------------------------------
-
-libpmt_la_SOURCES = \
- pmt.cc \
- pmt_io.cc \
- pmt_pool.cc \
- pmt_serialize.cc \
- pmt_unv.cc
-
-libpmt_la_LIBADD = \
- $(BOOST_THREAD_LIB) \
- -lstdc++
-
-libpmt_la_LDFLAGS = \
- $(BOOST_LDFLAGS)
-
-noinst_HEADERS = \
- $(GENERATED_H) \
- pmt_int.h \
- qa_pmt.h \
- qa_pmt_prims.h
-
-# Build the qa code into its own library
-
-noinst_LTLIBRARIES += libpmt-qa.la
-
-libpmt_qa_la_SOURCES = \
- qa_pmt.cc \
- qa_pmt_prims.cc \
- qa_pmt_unv.cc
-
-# magic flags
-libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid version
-
-libpmt_qa_la_LIBADD = \
- libpmt.la \
- $(CPPUNIT_LIBS) \
- -lstdc++
-
-
-# Do creation and inclusion of other Makefiles last
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(python_built_sources)
-gen_sources_deps = $(core_generator)
-par_gen_command = PYTHONPATH=$(top_srcdir)/gruel/src/lib/pmt srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_unv.py
-include $(top_srcdir)/Makefile.par.gen
-
-# Rule to create the build header file using python
-# Doesn't need parallel protections because there is a single target
-$(PMT_SERIAL_TAGS_H): $(top_srcdir)/gruel/src/scheme/gnuradio/gen-serial-tags.py $(top_srcdir)/gruel/src/scheme/gnuradio/pmt-serial-tags.scm
- $(PYTHON) $^ $@
diff --git a/gruel/src/lib/pmt/gen-serial-tags.py b/gruel/src/lib/pmt/gen-serial-tags.py
new file mode 100644
index 000000000..18e927beb
--- /dev/null
+++ b/gruel/src/lib/pmt/gen-serial-tags.py
@@ -0,0 +1,53 @@
+"""
+//
+// Copyright 2011 Free Software Foundation, Inc.
+//
+// This file is part of GNU Radio
+//
+// GNU Radio 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 3, or (at your option)
+// any later version.
+//
+// GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+//
+// THIS FILE IS MACHINE GENERATED FROM %s. DO NOT EDIT BY HAND.
+// See %s for additional commentary.
+//
+
+#ifndef INCLUDED_PMT_SERIAL_TAGS_H
+#define INCLUDED_PMT_SERIAL_TAGS_H
+
+enum pst_tags {
+%s
+};
+#endif /* INCLUDED_PMT_SERIAL_TAGS_H */
+"""
+
+import sys, os, re
+
+if __name__ == '__main__':
+ if len(sys.argv) != 3:
+ print "Usage %s <input_scm_file> <output_hdr_file>"%__file__
+ exit()
+ input_scm_file, output_hdr_file = sys.argv[1:]
+ enums = list()
+ for line in open(input_scm_file).readlines():
+ match = re.match('^\s*\(define\s+([\w|-]+)\s+#x([0-9a-fA-F]+)\)', line)
+ if not match: continue
+ name, value = match.groups()
+ name = name.upper().replace('-', '_')
+ enums.append(' %s = 0x%s'%(name, value))
+ open(output_hdr_file, 'w').write(__doc__%(
+ os.path.basename(__file__),
+ os.path.basename(input_scm_file),
+ ',\n'.join(enums),
+ ))
diff --git a/gruel/src/lib/pmt/generate_unv.py b/gruel/src/lib/pmt/generate_unv.py
index 02aace250..42b57e245 100755
--- a/gruel/src/lib/pmt/generate_unv.py
+++ b/gruel/src/lib/pmt/generate_unv.py
@@ -1,24 +1,24 @@
#!/usr/bin/env python
#
# Copyright 2006,2009 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio 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 3, or (at your option)
# any later version.
-#
+#
# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
"""
Generate code for uniform numeric vectors
@@ -46,19 +46,19 @@ header = """\
/* -*- c++ -*- */
/*
* Copyright 2006,2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -118,7 +118,7 @@ def do_substitution (d, input, out_file):
key = match_obj.group (1)
# print key
return d[key]
-
+
out = re.sub (r"@([a-zA-Z0-9_]+)@", repl, input)
out_file.write (out)
@@ -164,7 +164,7 @@ class qa_pmt_unv : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE_END();
private:
-''')
+''')
for tag, typ in unv_types:
output.write(' void test_%svector();\n' % (tag,))
output.write('};\n')
@@ -178,7 +178,7 @@ def generate_qa_cc():
for tag, typ in unv_types:
d = { 'TAG' : tag, 'TYPE' : typ }
do_substitution(d, template, output)
-
+
def main():
generate_h()
diff --git a/gruel/src/lib/pmt/pmt-serial-tags.scm b/gruel/src/lib/pmt/pmt-serial-tags.scm
new file mode 100644
index 000000000..ca25a43a8
--- /dev/null
+++ b/gruel/src/lib/pmt/pmt-serial-tags.scm
@@ -0,0 +1,75 @@
+;;; -*-scheme-*-
+;;;
+;;; Copyright 2007 Free Software Foundation, Inc.
+;;;
+;;; This file is part of GNU Radio
+;;;
+;;; GNU Radio 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 3, or (define at your option)
+;;; any later version.
+;;;
+;;; GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+;;;
+
+;;; definitions of tag values used for marshalling pmt data
+
+(define pst-true #x00)
+(define pst-false #x01)
+(define pst-symbol #x02) ; untagged-int16 n; followed by n bytes of symbol name
+(define pst-int32 #x03)
+(define pst-double #x04)
+(define pst-complex #x05) ; complex<double>: real, imag
+(define pst-null #x06)
+(define pst-pair #x07) ; followed by two objects
+(define pst-vector #x08) ; untagged-int32 n; followed by n objects
+(define pst-dict #x09) ; untagged-int32 n; followed by n key/value tuples
+
+(define pst-uniform-vector #x0a)
+
+;; u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, c32, c64
+;;
+;; untagged-uint8 tag
+;; untagged-uint8 uvi (define uniform vector info, see below)
+;; untagged-int32 n-items
+;; untagged-uint8 npad
+;; npad bytes of zeros to align binary data
+;; n-items binary numeric items
+;;
+;; uvi:
+;; +-+-+-+-+-+-+-+-+
+;; |B| subtype |
+;; +-+-+-+-+-+-+-+-+
+;;
+;; B == 0, numeric data is little-endian.
+;; B == 1, numeric data is big-endian.
+
+ (define uvi-endian-mask #x80)
+ (define uvi-subtype-mask #x7f)
+
+ (define uvi-little-endian #x00)
+ (define uvi-big-endian #x80)
+
+ (define uvi-u8 #x00)
+ (define uvi-s8 #x01)
+ (define uvi-u16 #x02)
+ (define uvi-s16 #x03)
+ (define uvi-u32 #x04)
+ (define uvi-s32 #x05)
+ (define uvi-u64 #x06)
+ (define uvi-s64 #x07)
+ (define uvi-f32 #x08)
+ (define uvi-f64 #x09)
+ (define uvi-c32 #x0a)
+ (define uvi-c64 #x0b)
+
+
+(define pst-comment #x3b) ; ascii ';'
+(define pst-comment-end #x0a) ; ascii '\n'
diff --git a/gruel/src/lib/pmt/pmt.cc b/gruel/src/lib/pmt/pmt.cc
index f9cf6b4bf..1d9125d4e 100644
--- a/gruel/src/lib/pmt/pmt.cc
+++ b/gruel/src/lib/pmt/pmt.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009,2010 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -229,13 +229,13 @@ hash_string(const std::string &s)
return h;
}
-bool
+bool
pmt_is_symbol(const pmt_t& obj)
{
return obj->is_symbol();
}
-pmt_t
+pmt_t
pmt_string_to_symbol(const std::string &name)
{
unsigned hash = hash_string(name) % SYMBOL_HASH_TABLE_SIZE;
@@ -350,7 +350,7 @@ pmt_to_uint64(pmt_t x)
pmt_real::pmt_real(double value) : d_value(value) {}
-bool
+bool
pmt_is_real(pmt_t x)
{
return x->is_real();
@@ -379,7 +379,7 @@ pmt_to_double(pmt_t x)
pmt_complex::pmt_complex(std::complex<double> value) : d_value(value) {}
-bool
+bool
pmt_is_complex(pmt_t x)
{
return x->is_complex();
@@ -435,7 +435,7 @@ pmt_car(const pmt_t& pair)
pmt_pair* p = dynamic_cast<pmt_pair*>(pair.get());
if ( p )
return p->car();
-
+
throw pmt_wrong_type("pmt_car", pair);
}
@@ -445,7 +445,7 @@ pmt_cdr(const pmt_t& pair)
pmt_pair* p = dynamic_cast<pmt_pair*>(pair.get());
if ( p )
return p->cdr();
-
+
throw pmt_wrong_type("pmt_cdr", pair);
}
@@ -766,7 +766,7 @@ pmt_uniform_vector_writable_elements(pmt_t vector, size_t &len)
* This is an a-list implementation.
*
* When we need better performance for large dictionaries, consider implementing
- * persistent Red-Black trees as described in "Purely Functional Data Structures",
+ * persistent Red-Black trees as described in "Purely Functional Data Structures",
* Chris Okasaki, 1998, section 3.3.
*/
@@ -802,7 +802,7 @@ pmt_dict_delete(const pmt_t &dict, const pmt_t &key)
if (pmt_eqv(pmt_caar(dict), key))
return pmt_cdr(dict);
-
+
return pmt_cons(pmt_car(dict), pmt_dict_delete(pmt_cdr(dict), key));
}
@@ -887,7 +887,7 @@ pmt_any_set(pmt_t obj, const boost::any &any)
// msg_accepter -- built from "any"
////////////////////////////////////////////////////////////////////////////
-bool
+bool
pmt_is_msg_accepter(const pmt_t &obj)
{
if (!pmt_is_any(obj))
@@ -1222,7 +1222,7 @@ pmt_nthcdr(size_t n, pmt_t list)
{
if (!(pmt_is_pair(list) || pmt_is_null(list)))
throw pmt_wrong_type("pmt_nthcdr", list);
-
+
while (n > 0){
if (pmt_is_pair(list)){
list = pmt_cdr(list);
@@ -1359,7 +1359,7 @@ pmt_cadddr(pmt_t pair)
{
return pmt_car(pmt_cdr(pmt_cdr(pmt_cdr(pair))));
}
-
+
bool
pmt_is_eof_object(pmt_t obj)
{
diff --git a/gruel/src/lib/pmt/pmt_int.h b/gruel/src/lib/pmt/pmt_int.h
index 3a5cd382b..d669e1049 100644
--- a/gruel/src/lib/pmt/pmt_int.h
+++ b/gruel/src/lib/pmt/pmt_int.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009,2010 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -94,7 +94,7 @@ class pmt_symbol : public pmt_base
{
std::string d_name;
pmt_t d_next;
-
+
public:
pmt_symbol(const std::string &name);
//~pmt_symbol(){}
diff --git a/gruel/src/lib/pmt/pmt_io.cc b/gruel/src/lib/pmt/pmt_io.cc
index 1214ff588..4bac4a0ec 100644
--- a/gruel/src/lib/pmt/pmt_io.cc
+++ b/gruel/src/lib/pmt/pmt_io.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -127,7 +127,7 @@ std::ostream& operator<<(std::ostream &os, pmt_t obj)
return os;
}
-std::string
+std::string
pmt_write_string(pmt_t obj)
{
std::ostringstream s;
@@ -150,7 +150,7 @@ pmt_serialize(pmt_t obj, std::ostream &sink)
/*!
* \brief Create obj from portable byte-serial representation
*/
-pmt_t
+pmt_t
pmt_deserialize(std::istream &source)
{
throw pmt_notimplemented("notimplemented: pmt_deserialize", PMT_NIL);
@@ -159,7 +159,7 @@ pmt_deserialize(std::istream &source)
} /* namespace pmt */
-void
+void
pmt::pmt_print(pmt_t v)
{
std::cout << pmt_write_string(v) << std::endl;
diff --git a/gruel/src/lib/pmt/pmt_pool.cc b/gruel/src/lib/pmt/pmt_pool.cc
index 731d28ca7..63a681abf 100644
--- a/gruel/src/lib/pmt/pmt_pool.cc
+++ b/gruel/src/lib/pmt/pmt_pool.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2007,2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/gruel/src/lib/pmt/pmt_serialize.cc b/gruel/src/lib/pmt/pmt_serialize.cc
index 184a31e6b..de9644c3c 100644
--- a/gruel/src/lib/pmt/pmt_serialize.cc
+++ b/gruel/src/lib/pmt/pmt_serialize.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2007,2009 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -216,7 +216,7 @@ deserialize_untagged_f64(double *ip, std::streambuf &sb)
*ip = iu.id;
return t != std::streambuf::traits_type::eof();
}
-
+
/*
* Write portable byte-serial representation of \p obj to \p sb
@@ -227,7 +227,7 @@ bool
pmt_serialize(pmt_t obj, std::streambuf &sb)
{
bool ok = true;
-
+
tail_recursion:
if (pmt_is_bool(obj)){
@@ -236,7 +236,7 @@ pmt_serialize(pmt_t obj, std::streambuf &sb)
else
return serialize_untagged_u8(PST_FALSE, sb);
}
-
+
if (pmt_is_null(obj))
return serialize_untagged_u8(PST_NULL, sb);
@@ -294,10 +294,10 @@ pmt_serialize(pmt_t obj, std::streambuf &sb)
if (pmt_is_uniform_vector(obj))
throw pmt_notimplemented("pmt_serialize (uniform-vector)", obj);
-
+
if (pmt_is_dict(obj))
throw pmt_notimplemented("pmt_serialize (dict)", obj);
-
+
throw pmt_notimplemented("pmt_serialize (?)", obj);
}
@@ -325,7 +325,7 @@ pmt_deserialize(std::streambuf &sb)
switch (tag){
case PST_TRUE:
return PMT_T;
-
+
case PST_FALSE:
return PMT_F;
@@ -369,7 +369,7 @@ pmt_deserialize(std::streambuf &sb)
case PST_COMMENT:
throw pmt_notimplemented("pmt_deserialize: tag value = ",
pmt_from_long(tag));
-
+
default:
throw pmt_exception("pmt_deserialize: malformed input stream, tag value = ",
pmt_from_long(tag));
diff --git a/gruel/src/lib/pmt/qa_pmt.cc b/gruel/src/lib/pmt/qa_pmt.cc
index 250befafa..27c617e74 100644
--- a/gruel/src/lib/pmt/qa_pmt.cc
+++ b/gruel/src/lib/pmt/qa_pmt.cc
@@ -1,18 +1,18 @@
/*
* Copyright 2006 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -35,6 +35,6 @@ qa_pmt::suite ()
s->addTest (qa_pmt_prims::suite ());
s->addTest (qa_pmt_unv::suite ());
-
+
return s;
}
diff --git a/gruel/src/lib/pmt/qa_pmt.h b/gruel/src/lib/pmt/qa_pmt.h
index 424c1065b..3de5872c7 100644
--- a/gruel/src/lib/pmt/qa_pmt.h
+++ b/gruel/src/lib/pmt/qa_pmt.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gruel/src/lib/pmt/qa_pmt_prims.cc b/gruel/src/lib/pmt/qa_pmt_prims.cc
index 7dec30d56..6212b8ea4 100644
--- a/gruel/src/lib/pmt/qa_pmt_prims.cc
+++ b/gruel/src/lib/pmt/qa_pmt_prims.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009,2010 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -173,7 +173,7 @@ qa_pmt_prims::test_pairs()
CPPUNIT_ASSERT_EQUAL(s3, pmt_car(c1));
CPPUNIT_ASSERT_EQUAL((size_t)1, pmt_length(c3));
CPPUNIT_ASSERT_EQUAL((size_t)2, pmt_length(c2));
-
+
CPPUNIT_ASSERT_THROW(pmt_cdr(PMT_NIL), pmt_wrong_type);
CPPUNIT_ASSERT_THROW(pmt_car(PMT_NIL), pmt_wrong_type);
CPPUNIT_ASSERT_THROW(pmt_set_car(s1, PMT_NIL), pmt_wrong_type);
@@ -282,7 +282,7 @@ qa_pmt_prims::test_tuples()
//std::cout << v << std::endl;
//std::cout << t2 << std::endl;
-
+
t = pmt_make_tuple(s[0], s[1], s[2]);
pmt_t list0 = pmt_list3(s[0], s[1], s[2]);
CPPUNIT_ASSERT_EQUAL(size_t(3), pmt_length(list0));
@@ -346,11 +346,11 @@ qa_pmt_prims::test_misc()
pmt_t p0 = pmt_cons(k0, v0);
pmt_t p1 = pmt_cons(k1, v1);
pmt_t p2 = pmt_cons(k2, v2);
-
+
pmt_t alist = pmt_cons(p0, pmt_cons(p1, pmt_cons(p2, PMT_NIL)));
CPPUNIT_ASSERT(pmt_eq(p1, pmt_assv(k1, alist)));
CPPUNIT_ASSERT(pmt_eq(PMT_F, pmt_assv(k3, alist)));
-
+
pmt_t keys = pmt_cons(k0, pmt_cons(k1, pmt_cons(k2, PMT_NIL)));
pmt_t vals = pmt_cons(v0, pmt_cons(v1, pmt_cons(v2, PMT_NIL)));
CPPUNIT_ASSERT(pmt_equal(keys, pmt_map(pmt_car, alist)));
@@ -372,7 +372,7 @@ qa_pmt_prims::test_dict()
pmt_t v2 = mp("v2");
pmt_t v3 = mp("v3");
pmt_t not_found = pmt_cons(PMT_NIL, PMT_NIL);
-
+
CPPUNIT_ASSERT(!pmt_dict_has_key(dict, k0));
dict = pmt_dict_add(dict, k0, v0);
CPPUNIT_ASSERT(pmt_dict_has_key(dict, k0));
diff --git a/gruel/src/lib/pmt/qa_pmt_prims.h b/gruel/src/lib/pmt/qa_pmt_prims.h
index cc1409ee6..a407509b2 100644
--- a/gruel/src/lib/pmt/qa_pmt_prims.h
+++ b/gruel/src/lib/pmt/qa_pmt_prims.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gruel/src/lib/pmt/unv_template.cc.t b/gruel/src/lib/pmt/unv_template.cc.t
index 148965c09..566168c3d 100644
--- a/gruel/src/lib/pmt/unv_template.cc.t
+++ b/gruel/src/lib/pmt/unv_template.cc.t
@@ -33,7 +33,7 @@ pmt_@TAG@vector::ref(size_t k) const
return d_v[k];
}
-void
+void
pmt_@TAG@vector::set(size_t k, @TYPE@ x)
{
if (k >= length())
diff --git a/gruel/src/lib/realtime.cc b/gruel/src/lib/realtime.cc
index 96351f812..e01c6c53d 100644
--- a/gruel/src/lib/realtime.cc
+++ b/gruel/src/lib/realtime.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2007,2008 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -90,7 +90,7 @@ namespace gruel {
return RT_OTHER_ERROR;
}
}
-
+
//printf("SCHED_FIFO enabled with priority = %d\n", pri);
return RT_OK;
}
@@ -125,7 +125,7 @@ namespace gruel {
return RT_OTHER_ERROR;
}
}
-
+
//printf("SCHED_FIFO enabled with priority = %d\n", pri);
return RT_OK;
}
diff --git a/gruel/src/lib/sys_pri.cc b/gruel/src/lib/sys_pri.cc
index dc0164d70..c8a505341 100644
--- a/gruel/src/lib/sys_pri.cc
+++ b/gruel/src/lib/sys_pri.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2008 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/gruel/src/lib/test_gruel.cc b/gruel/src/lib/test_gruel.cc
index 7ef3520e6..f32e3f341 100644
--- a/gruel/src/lib/test_gruel.cc
+++ b/gruel/src/lib/test_gruel.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009,2010,2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -32,7 +32,7 @@
#include <boost/filesystem/path.hpp>
namespace fs = boost::filesystem;
-int
+int
main(int argc, char **argv)
{
fs::path path = fs::current_path() / ".unittests";
@@ -45,7 +45,7 @@ main(int argc, char **argv)
runner.addTest(qa_pmt::suite ());
runner.setOutputter(xmlout);
-
+
bool was_successful = runner.run("", false);
return was_successful ? 0 : 1;
diff --git a/gruel/src/lib/thread_body_wrapper.cc b/gruel/src/lib/thread_body_wrapper.cc
index 86c4edb5b..019eaa342 100644
--- a/gruel/src/lib/thread_body_wrapper.cc
+++ b/gruel/src/lib/thread_body_wrapper.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2008 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -37,7 +37,7 @@ namespace gruel {
sigset_t new_set;
int r;
- sigemptyset(&new_set);
+ sigemptyset(&new_set);
sigaddset(&new_set, SIGHUP); // block these...
sigaddset(&new_set, SIGINT);
sigaddset(&new_set, SIGPIPE);
diff --git a/gruel/src/lib/thread_group.cc b/gruel/src/lib/thread_group.cc
index fa78567ec..9e8ded4df 100644
--- a/gruel/src/lib/thread_group.cc
+++ b/gruel/src/lib/thread_group.cc
@@ -4,7 +4,7 @@
* Copyright (C) 2007 Anthony Williams
* Copyright 2008 Free Software Foundation, Inc.
*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/