From c48f42b58c67eefd19ea1a803329bcf62eac06e9 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Wed, 25 Feb 2009 19:04:35 +0000 Subject: [PATCH] Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread header files into /gnuradio. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10506 221aa14e-8319-0410-a670-987f0aec2ac5 --- config/grc_omnithread.m4 | 1 + gcell/apps/benchmark_dma.cc | 2 +- gcell/apps/benchmark_nop.cc | 2 +- gcell/apps/benchmark_roundtrip.cc | 2 +- gcell/lib/runtime/gc_client_thread_info.h | 2 +- gnuradio-core/src/lib/io/gr_file_sink_base.h | 2 +- gnuradio-core/src/lib/io/gr_udp_sink.h | 2 +- gnuradio-core/src/lib/io/gr_udp_source.h | 2 +- gnuradio-core/src/lib/io/gr_wavfile_sink.h | 2 +- gnuradio-core/src/lib/io/gri_logger.h | 2 +- gnuradio-core/src/lib/runtime/gr_msg_queue.h | 2 +- .../src/lib/runtime/gr_sptr_magic.cc | 2 +- gr-audio-osx/src/mld_threads.h | 2 +- .../src/audio_portaudio_sink.cc | 2 +- gr-audio-portaudio/src/audio_portaudio_sink.h | 2 +- .../src/audio_portaudio_source.cc | 2 +- .../src/audio_portaudio_source.h | 2 +- mblock/src/include/mblock/msg_queue.h | 2 +- mblock/src/include/mblock/runtime.h | 2 +- mblock/src/include/mblock/time.h | 2 +- mblock/src/lib/mb_runtime_base.h | 2 +- mblock/src/lib/mb_runtime_thread_per_block.cc | 2 +- mblock/src/lib/mb_worker.h | 2 +- omnithread/Makefile.am | 12 ++----- omnithread/gnuradio/Makefile.am | 32 +++++++++++++++++++ omnithread/{ => gnuradio}/omni_time.h | 0 omnithread/{ => gnuradio}/omnithread.h | 14 ++++---- omnithread/{ => gnuradio}/ot_VxThread.h | 0 omnithread/{ => gnuradio}/ot_mach.h | 0 omnithread/{ => gnuradio}/ot_nt.h | 0 omnithread/{ => gnuradio}/ot_posix.h | 0 omnithread/{ => gnuradio}/ot_pthread_nt.h | 0 omnithread/{ => gnuradio}/ot_solaris.h | 0 omnithread/mach.cc | 2 +- omnithread/nt.cc | 2 +- omnithread/omni_time.cc | 4 +-- omnithread/posix.cc | 2 +- omnithread/solaris.cc | 2 +- omnithread/vxWorks.cc | 2 +- pmt/src/lib/pmt_pool.h | 2 +- usrp/host/lib/legacy/mld_threads.h | 2 +- usrp2/host/lib/control.cc | 2 +- usrp2/host/lib/control.h | 2 +- usrp2/host/lib/ring.h | 2 +- usrp2/host/lib/usrp2_thread.h | 2 +- 45 files changed, 77 insertions(+), 52 deletions(-) create mode 100644 omnithread/gnuradio/Makefile.am rename omnithread/{ => gnuradio}/omni_time.h (100%) rename omnithread/{ => gnuradio}/omnithread.h (98%) rename omnithread/{ => gnuradio}/ot_VxThread.h (100%) rename omnithread/{ => gnuradio}/ot_mach.h (100%) rename omnithread/{ => gnuradio}/ot_nt.h (100%) rename omnithread/{ => gnuradio}/ot_posix.h (100%) rename omnithread/{ => gnuradio}/ot_pthread_nt.h (100%) rename omnithread/{ => gnuradio}/ot_solaris.h (100%) diff --git a/config/grc_omnithread.m4 b/config/grc_omnithread.m4 index 3e52c659..1bcedebe 100644 --- a/config/grc_omnithread.m4 +++ b/config/grc_omnithread.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GRC_OMNITHREAD],[ AC_CONFIG_FILES([ \ omnithread/Makefile \ + omnithread/gnuradio/Makefile \ omnithread/gnuradio-omnithread.pc ]) diff --git a/gcell/apps/benchmark_dma.cc b/gcell/apps/benchmark_dma.cc index bce1953a..a84defe3 100644 --- a/gcell/apps/benchmark_dma.cc +++ b/gcell/apps/benchmark_dma.cc @@ -23,7 +23,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/gcell/apps/benchmark_nop.cc b/gcell/apps/benchmark_nop.cc index 10f9d4c5..dee46c84 100644 --- a/gcell/apps/benchmark_nop.cc +++ b/gcell/apps/benchmark_nop.cc @@ -23,7 +23,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/gcell/apps/benchmark_roundtrip.cc b/gcell/apps/benchmark_roundtrip.cc index 85af03a0..8ba37c96 100644 --- a/gcell/apps/benchmark_roundtrip.cc +++ b/gcell/apps/benchmark_roundtrip.cc @@ -23,7 +23,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/gcell/lib/runtime/gc_client_thread_info.h b/gcell/lib/runtime/gc_client_thread_info.h index fbb35d96..9f46ecca 100644 --- a/gcell/lib/runtime/gc_client_thread_info.h +++ b/gcell/lib/runtime/gc_client_thread_info.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_GC_CLIENT_THREAD_INFO_H #define INCLUDED_GC_CLIENT_THREAD_INFO_H -#include +#include #include enum gc_ct_state { diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.h b/gnuradio-core/src/lib/io/gr_file_sink_base.h index c848818f..f36f5ac9 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink_base.h +++ b/gnuradio-core/src/lib/io/gr_file_sink_base.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_FILE_SINK_BASE_H #define INCLUDED_GR_FILE_SINK_BASE_H -#include +#include #include /*! diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h index e5938001..99f1b293 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.h +++ b/gnuradio-core/src/lib/io/gr_udp_sink.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UDP_SINK_H #include -#include +#include #if defined(HAVE_SOCKET) #include #include diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h index a4403c3d..04974015 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.h +++ b/gnuradio-core/src/lib/io/gr_udp_source.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UDP_SOURCE_H #include -#include +#include #if defined(HAVE_SOCKET) #include #include diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.h b/gnuradio-core/src/lib/io/gr_wavfile_sink.h index 3fa06f20..9429165f 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_sink.h +++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.h @@ -25,7 +25,7 @@ #include #include -#include +#include class gr_wavfile_sink; typedef boost::shared_ptr gr_wavfile_sink_sptr; diff --git a/gnuradio-core/src/lib/io/gri_logger.h b/gnuradio-core/src/lib/io/gri_logger.h index da54e56a..e5caf7d0 100644 --- a/gnuradio-core/src/lib/io/gri_logger.h +++ b/gnuradio-core/src/lib/io/gri_logger.h @@ -23,7 +23,7 @@ #define INCLUDED_GRI_LOGGER_H #include -#include +#include #include class gri_log_poster; diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.h b/gnuradio-core/src/lib/runtime/gr_msg_queue.h index 38556b3c..f965887e 100644 --- a/gnuradio-core/src/lib/runtime/gr_msg_queue.h +++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.h @@ -23,7 +23,7 @@ #define INCLUDED_GR_MSG_QUEUE_H #include -#include +#include class gr_msg_queue; typedef boost::shared_ptr gr_msg_queue_sptr; diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc index dc0b232a..3295f849 100644 --- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc +++ b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc @@ -32,7 +32,7 @@ typedef boost::mutex mutex; typedef boost::mutex::scoped_lock scoped_lock; #else - #include + #include typedef omni_mutex mutex; typedef omni_mutex_lock scoped_lock; #endif diff --git a/gr-audio-osx/src/mld_threads.h b/gr-audio-osx/src/mld_threads.h index a59a9286..d2fb4ea7 100644 --- a/gr-audio-osx/src/mld_threads.h +++ b/gr-audio-osx/src/mld_threads.h @@ -29,7 +29,7 @@ #define __macos__ #ifdef _USE_OMNI_THREADS_ -#include +#include #else #include #endif diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.cc b/gr-audio-portaudio/src/audio_portaudio_sink.cc index 49c76a5f..cfdc6302 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.cc +++ b/gr-audio-portaudio/src/audio_portaudio_sink.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #define LOGGING 0 // define to 0 or 1 diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.h b/gr-audio-portaudio/src/audio_portaudio_sink.h index cc301050..1ac8edc8 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.h +++ b/gr-audio-portaudio/src/audio_portaudio_sink.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/gr-audio-portaudio/src/audio_portaudio_source.cc b/gr-audio-portaudio/src/audio_portaudio_source.cc index 4ea4eeb9..29d63a8e 100644 --- a/gr-audio-portaudio/src/audio_portaudio_source.cc +++ b/gr-audio-portaudio/src/audio_portaudio_source.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #define LOGGING 0 // define to 0 or 1 diff --git a/gr-audio-portaudio/src/audio_portaudio_source.h b/gr-audio-portaudio/src/audio_portaudio_source.h index c132268c..8bb4a02a 100644 --- a/gr-audio-portaudio/src/audio_portaudio_source.h +++ b/gr-audio-portaudio/src/audio_portaudio_source.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/mblock/src/include/mblock/msg_queue.h b/mblock/src/include/mblock/msg_queue.h index 31ff65a5..a2339708 100644 --- a/mblock/src/include/mblock/msg_queue.h +++ b/mblock/src/include/mblock/msg_queue.h @@ -22,7 +22,7 @@ #define INCLUDED_MB_MSG_QUEUE_H #include -#include +#include #include /*! diff --git a/mblock/src/include/mblock/runtime.h b/mblock/src/include/mblock/runtime.h index 4236e346..4d9d6736 100644 --- a/mblock/src/include/mblock/runtime.h +++ b/mblock/src/include/mblock/runtime.h @@ -22,7 +22,7 @@ #define INCLUDED_MB_RUNTIME_H #include -#include +#include /*! * \brief Public constructor (factory) for mb_runtime objects. diff --git a/mblock/src/include/mblock/time.h b/mblock/src/include/mblock/time.h index cba6be78..630fa845 100644 --- a/mblock/src/include/mblock/time.h +++ b/mblock/src/include/mblock/time.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_MB_TIME_H #define INCLUDED_MB_TIME_H -#include +#include typedef omni_time mb_time; #endif /* INCLUDED_MB_TIME_H */ diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h index 019662bc..b88a9ca4 100644 --- a/mblock/src/lib/mb_runtime_base.h +++ b/mblock/src/lib/mb_runtime_base.h @@ -23,7 +23,7 @@ #define INCLUDED_MB_RUNTIME_BASE_H #include -#include +#include #include /* diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index d12014a1..ed292ee7 100644 --- a/mblock/src/lib/mb_runtime_thread_per_block.cc +++ b/mblock/src/lib/mb_runtime_thread_per_block.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index b840ae55..9831de92 100644 --- a/mblock/src/lib/mb_worker.h +++ b/mblock/src/lib/mb_worker.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_MB_WORKER_H #define INCLUDED_MB_WORKER_H -#include +#include #include #include diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am index d0dde72b..88df2714 100644 --- a/omnithread/Makefile.am +++ b/omnithread/Makefile.am @@ -21,6 +21,8 @@ include $(top_srcdir)/Makefile.common +SUBDIRS = gnuradio + # This is the omnithread package, # extracted from the omniORB-4.0.1 distribution @@ -66,13 +68,3 @@ EXTRA_DIST = \ threaddata.cc \ vxWorks.cc \ dir.mk - -grinclude_HEADERS = \ - omnithread.h \ - omni_time.h \ - ot_mach.h \ - ot_nt.h \ - ot_posix.h \ - ot_pthread_nt.h \ - ot_solaris.h \ - ot_VxThread.h diff --git a/omnithread/gnuradio/Makefile.am b/omnithread/gnuradio/Makefile.am new file mode 100644 index 00000000..1ec56129 --- /dev/null +++ b/omnithread/gnuradio/Makefile.am @@ -0,0 +1,32 @@ +# +# 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, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +grinclude_HEADERS = \ + omnithread.h \ + omni_time.h \ + ot_mach.h \ + ot_nt.h \ + ot_posix.h \ + ot_pthread_nt.h \ + ot_solaris.h \ + ot_VxThread.h diff --git a/omnithread/omni_time.h b/omnithread/gnuradio/omni_time.h similarity index 100% rename from omnithread/omni_time.h rename to omnithread/gnuradio/omni_time.h diff --git a/omnithread/omnithread.h b/omnithread/gnuradio/omnithread.h similarity index 98% rename from omnithread/omnithread.h rename to omnithread/gnuradio/omnithread.h index 26e42b0e..8e8162b1 100644 --- a/omnithread/omnithread.h +++ b/omnithread/gnuradio/omnithread.h @@ -77,10 +77,10 @@ class omni_thread; #endif #if defined(OMNITHREAD_POSIX) -#include +#include #elif defined(OMNITHREAD_NT) -#include +#include #ifdef _MSC_VER @@ -111,7 +111,7 @@ class omni_thread; // _MSC_VER #elif defined(__vxWorks__) -#include +#include #elif defined(__sunos__) #if __OSVERSION__ != 5 @@ -122,17 +122,17 @@ class omni_thread; #endif #endif #ifdef UseSolarisThreads -#include +#include #else -#include +#include #endif #elif defined(__rtems__) -#include +#include #include #elif defined(__macos__) -#include +#include #include #else diff --git a/omnithread/ot_VxThread.h b/omnithread/gnuradio/ot_VxThread.h similarity index 100% rename from omnithread/ot_VxThread.h rename to omnithread/gnuradio/ot_VxThread.h diff --git a/omnithread/ot_mach.h b/omnithread/gnuradio/ot_mach.h similarity index 100% rename from omnithread/ot_mach.h rename to omnithread/gnuradio/ot_mach.h diff --git a/omnithread/ot_nt.h b/omnithread/gnuradio/ot_nt.h similarity index 100% rename from omnithread/ot_nt.h rename to omnithread/gnuradio/ot_nt.h diff --git a/omnithread/ot_posix.h b/omnithread/gnuradio/ot_posix.h similarity index 100% rename from omnithread/ot_posix.h rename to omnithread/gnuradio/ot_posix.h diff --git a/omnithread/ot_pthread_nt.h b/omnithread/gnuradio/ot_pthread_nt.h similarity index 100% rename from omnithread/ot_pthread_nt.h rename to omnithread/gnuradio/ot_pthread_nt.h diff --git a/omnithread/ot_solaris.h b/omnithread/gnuradio/ot_solaris.h similarity index 100% rename from omnithread/ot_solaris.h rename to omnithread/gnuradio/ot_solaris.h diff --git a/omnithread/mach.cc b/omnithread/mach.cc index 8759bb4c..aa0465f4 100644 --- a/omnithread/mach.cc +++ b/omnithread/mach.cc @@ -31,7 +31,7 @@ #include #include #include -#include "omnithread.h" +#include "gnuradio/omnithread.h" #define DB(x) // x // #include or #include if DB is on. diff --git a/omnithread/nt.cc b/omnithread/nt.cc index 3853f010..2c97d621 100644 --- a/omnithread/nt.cc +++ b/omnithread/nt.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define DB(x) // x diff --git a/omnithread/omni_time.cc b/omnithread/omni_time.cc index 8703245b..4920a683 100644 --- a/omnithread/omni_time.cc +++ b/omnithread/omni_time.cc @@ -22,8 +22,8 @@ #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include #include diff --git a/omnithread/posix.cc b/omnithread/posix.cc index 7325166c..5574a8a0 100644 --- a/omnithread/posix.cc +++ b/omnithread/posix.cc @@ -49,7 +49,7 @@ #include #include #include -#include +#include #if (PthreadDraftVersion == 0) #error "PthreadDraftVersion not defined. If not sure, define it to 10" diff --git a/omnithread/solaris.cc b/omnithread/solaris.cc index b0139d29..eedaaa99 100644 --- a/omnithread/solaris.cc +++ b/omnithread/solaris.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #define DB(x) // x // #include or #include if DB is on. diff --git a/omnithread/vxWorks.cc b/omnithread/vxWorks.cc index 25634ce9..aaff6cdb 100644 --- a/omnithread/vxWorks.cc +++ b/omnithread/vxWorks.cc @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include // assert diff --git a/pmt/src/lib/pmt_pool.h b/pmt/src/lib/pmt_pool.h index 42276a14..dd63d44a 100644 --- a/pmt/src/lib/pmt_pool.h +++ b/pmt/src/lib/pmt_pool.h @@ -22,7 +22,7 @@ #define INCLUDED_PMT_POOL_H #include -#include +#include #include /*! diff --git a/usrp/host/lib/legacy/mld_threads.h b/usrp/host/lib/legacy/mld_threads.h index b2ec6575..322f557b 100644 --- a/usrp/host/lib/legacy/mld_threads.h +++ b/usrp/host/lib/legacy/mld_threads.h @@ -29,7 +29,7 @@ #define __macos__ #ifdef _USE_OMNI_THREADS_ -#include +#include #else #include #endif diff --git a/usrp2/host/lib/control.cc b/usrp2/host/lib/control.cc index 97d969fa..4b8597c6 100644 --- a/usrp2/host/lib/control.cc +++ b/usrp2/host/lib/control.cc @@ -23,7 +23,7 @@ #include #endif -#include +#include #include "control.h" #include diff --git a/usrp2/host/lib/control.h b/usrp2/host/lib/control.h index 33f73fa9..0e8fcfe5 100644 --- a/usrp2/host/lib/control.h +++ b/usrp2/host/lib/control.h @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONTROL_H #define INCLUDED_CONTROL_H -#include +#include #include namespace usrp2 { diff --git a/usrp2/host/lib/ring.h b/usrp2/host/lib/ring.h index 2f4346ca..19ae9ae9 100644 --- a/usrp2/host/lib/ring.h +++ b/usrp2/host/lib/ring.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_RING_H #define INCLUDED_RING_H -#include +#include #include #include #include diff --git a/usrp2/host/lib/usrp2_thread.h b/usrp2/host/lib/usrp2_thread.h index c7f9e1aa..12723e94 100644 --- a/usrp2/host/lib/usrp2_thread.h +++ b/usrp2/host/lib/usrp2_thread.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_USRP2_THREAD_H #define INCLUDED_USRP2_THREAD_H -#include +#include #include namespace usrp2 { -- 2.30.2