diff options
| author | jcorgan | 2009-02-25 19:04:35 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-25 19:04:35 +0000 |
| commit | c48f42b58c67eefd19ea1a803329bcf62eac06e9 (patch) | |
| tree | d03af64023553b5f340ae676a918793e2ab39068 | |
| parent | 203024bad3191ea14eff902549e6b4d95e08e43c (diff) | |
| download | gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.tar.gz gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.tar.bz2 gnuradio-c48f42b58c67eefd19ea1a803329bcf62eac06e9.zip | |
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
45 files changed, 77 insertions, 52 deletions
diff --git a/config/grc_omnithread.m4 b/config/grc_omnithread.m4 index 3e52c659a..1bcedebe1 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 bce1953a3..a84defe37 100644 --- a/gcell/apps/benchmark_dma.cc +++ b/gcell/apps/benchmark_dma.cc @@ -23,7 +23,7 @@ #include <config.h> #endif #include <gcell/gc_job_manager.h> -#include <omni_time.h> +#include <gnuradio/omni_time.h> #include <getopt.h> #include <stdlib.h> #include <stdio.h> diff --git a/gcell/apps/benchmark_nop.cc b/gcell/apps/benchmark_nop.cc index 10f9d4c5a..dee46c842 100644 --- a/gcell/apps/benchmark_nop.cc +++ b/gcell/apps/benchmark_nop.cc @@ -23,7 +23,7 @@ #include <config.h> #endif #include <gcell/gc_job_manager.h> -#include <omni_time.h> +#include <gnuradio/omni_time.h> #include <getopt.h> #include <stdlib.h> #include <stdio.h> diff --git a/gcell/apps/benchmark_roundtrip.cc b/gcell/apps/benchmark_roundtrip.cc index 85af03a08..8ba37c968 100644 --- a/gcell/apps/benchmark_roundtrip.cc +++ b/gcell/apps/benchmark_roundtrip.cc @@ -23,7 +23,7 @@ #include <config.h> #endif #include <gcell/gc_job_manager.h> -#include <omni_time.h> +#include <gnuradio/omni_time.h> #include <getopt.h> #include <stdlib.h> #include <stdio.h> diff --git a/gcell/lib/runtime/gc_client_thread_info.h b/gcell/lib/runtime/gc_client_thread_info.h index fbb35d966..9f46ecca7 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <boost/utility.hpp> 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 c848818f8..f36f5ac97 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <cstdio> /*! diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h index e59380011..99f1b2935 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 <gr_sync_block.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #if defined(HAVE_SOCKET) #include <sys/socket.h> #include <arpa/inet.h> diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h index a4403c3d6..049740159 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 <gr_sync_block.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #if defined(HAVE_SOCKET) #include <sys/socket.h> #include <arpa/inet.h> diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.h b/gnuradio-core/src/lib/io/gr_wavfile_sink.h index 3fa06f202..9429165f6 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 <gr_sync_block.h> #include <gr_file_sink_base.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> class gr_wavfile_sink; typedef boost::shared_ptr<gr_wavfile_sink> 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 da54e56a2..e5caf7d06 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 <stddef.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <gr_buffer.h> 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 38556b3ca..f965887e1 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 <gr_msg_handler.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> class gr_msg_queue; typedef boost::shared_ptr<gr_msg_queue> 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 dc0b232a7..3295f849e 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 <omnithread.h> + #include <gnuradio/omnithread.h> 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 a59a92863..d2fb4ea7c 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 <omnithread.h> +#include <gnuradio/omnithread.h> #else #include <pthread.h> #endif diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.cc b/gr-audio-portaudio/src/audio_portaudio_sink.cc index 49c76a5f1..cfdc6302a 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.cc +++ b/gr-audio-portaudio/src/audio_portaudio_sink.cc @@ -32,7 +32,7 @@ #include <unistd.h> #include <stdexcept> #include <gri_portaudio.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <string.h> #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 cc301050d..1ac8edc84 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.h +++ b/gr-audio-portaudio/src/audio_portaudio_sink.h @@ -24,7 +24,7 @@ #include <gr_sync_block.h> #include <gr_buffer.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <string> #include <portaudio.h> #include <stdexcept> diff --git a/gr-audio-portaudio/src/audio_portaudio_source.cc b/gr-audio-portaudio/src/audio_portaudio_source.cc index 4ea4eeb9c..29d63a8ed 100644 --- a/gr-audio-portaudio/src/audio_portaudio_source.cc +++ b/gr-audio-portaudio/src/audio_portaudio_source.cc @@ -32,7 +32,7 @@ #include <unistd.h> #include <stdexcept> #include <gri_portaudio.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <string.h> #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 c132268c8..8bb4a02a7 100644 --- a/gr-audio-portaudio/src/audio_portaudio_source.h +++ b/gr-audio-portaudio/src/audio_portaudio_source.h @@ -24,7 +24,7 @@ #include <gr_sync_block.h> #include <gr_buffer.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <string> #include <portaudio.h> #include <stdexcept> diff --git a/mblock/src/include/mblock/msg_queue.h b/mblock/src/include/mblock/msg_queue.h index 31ff65a51..a23397081 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 <mblock/common.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/time.h> /*! diff --git a/mblock/src/include/mblock/runtime.h b/mblock/src/include/mblock/runtime.h index 4236e346f..4d9d6736b 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 <mblock/common.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> /*! * \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 cba6be785..630fa845c 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 <omni_time.h> +#include <gnuradio/omni_time.h> 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 019662bc2..b88a9ca4e 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 <mblock/runtime.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/time.h> /* diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc index d12014a16..ed292ee7c 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 <mblock/class_registry.h> #include <mblock/exception.h> #include <mb_worker.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <iostream> #include <mb_msg_accepter_msgq.h> diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h index b840ae557..9831de926 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <mblock/common.h> #include <mblock/class_registry.h> diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am index d0dde72b2..88df2714d 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 000000000..1ec561299 --- /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 index bfb151610..bfb151610 100644 --- a/omnithread/omni_time.h +++ b/omnithread/gnuradio/omni_time.h diff --git a/omnithread/omnithread.h b/omnithread/gnuradio/omnithread.h index 26e42b0e1..8e8162b10 100644 --- a/omnithread/omnithread.h +++ b/omnithread/gnuradio/omnithread.h @@ -77,10 +77,10 @@ class omni_thread; #endif #if defined(OMNITHREAD_POSIX) -#include <ot_posix.h> +#include <gnuradio/ot_posix.h> #elif defined(OMNITHREAD_NT) -#include <ot_nt.h> +#include <gnuradio/ot_nt.h> #ifdef _MSC_VER @@ -111,7 +111,7 @@ class omni_thread; // _MSC_VER #elif defined(__vxWorks__) -#include <ot_VxThread.h> +#include <gnuradio/ot_VxThread.h> #elif defined(__sunos__) #if __OSVERSION__ != 5 @@ -122,17 +122,17 @@ class omni_thread; #endif #endif #ifdef UseSolarisThreads -#include <ot_solaris.h> +#include <gnuradio/ot_solaris.h> #else -#include <ot_posix.h> +#include <gnuradio/ot_posix.h> #endif #elif defined(__rtems__) -#include <ot_posix.h> +#include <gnuradio/ot_posix.h> #include <sched.h> #elif defined(__macos__) -#include <ot_posix.h> +#include <gnuradio/ot_posix.h> #include <sched.h> #else diff --git a/omnithread/ot_VxThread.h b/omnithread/gnuradio/ot_VxThread.h index e96c036cc..e96c036cc 100644 --- a/omnithread/ot_VxThread.h +++ b/omnithread/gnuradio/ot_VxThread.h diff --git a/omnithread/ot_mach.h b/omnithread/gnuradio/ot_mach.h index 76361926c..76361926c 100644 --- a/omnithread/ot_mach.h +++ b/omnithread/gnuradio/ot_mach.h diff --git a/omnithread/ot_nt.h b/omnithread/gnuradio/ot_nt.h index 551ccf2f1..551ccf2f1 100644 --- a/omnithread/ot_nt.h +++ b/omnithread/gnuradio/ot_nt.h diff --git a/omnithread/ot_posix.h b/omnithread/gnuradio/ot_posix.h index 666ccc089..666ccc089 100644 --- a/omnithread/ot_posix.h +++ b/omnithread/gnuradio/ot_posix.h diff --git a/omnithread/ot_pthread_nt.h b/omnithread/gnuradio/ot_pthread_nt.h index 324b5257f..324b5257f 100644 --- a/omnithread/ot_pthread_nt.h +++ b/omnithread/gnuradio/ot_pthread_nt.h diff --git a/omnithread/ot_solaris.h b/omnithread/gnuradio/ot_solaris.h index f4fea0b11..f4fea0b11 100644 --- a/omnithread/ot_solaris.h +++ b/omnithread/gnuradio/ot_solaris.h diff --git a/omnithread/mach.cc b/omnithread/mach.cc index 8759bb4ce..aa0465f41 100644 --- a/omnithread/mach.cc +++ b/omnithread/mach.cc @@ -31,7 +31,7 @@ #include <errno.h> #include <sys/time.h> #include <mach/cthreads.h> -#include "omnithread.h" +#include "gnuradio/omnithread.h" #define DB(x) // x // #include <iostream> or #include <iostream.h> if DB is on. diff --git a/omnithread/nt.cc b/omnithread/nt.cc index 3853f0108..2c97d6213 100644 --- a/omnithread/nt.cc +++ b/omnithread/nt.cc @@ -33,7 +33,7 @@ #include <stdlib.h> #include <errno.h> #include <WinError.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <process.h> #define DB(x) // x diff --git a/omnithread/omni_time.cc b/omnithread/omni_time.cc index 8703245bf..4920a6839 100644 --- a/omnithread/omni_time.cc +++ b/omnithread/omni_time.cc @@ -22,8 +22,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <omni_time.h> -#include <omnithread.h> +#include <gnuradio/omni_time.h> +#include <gnuradio/omnithread.h> #include <math.h> #include <assert.h> diff --git a/omnithread/posix.cc b/omnithread/posix.cc index 7325166c6..5574a8a0d 100644 --- a/omnithread/posix.cc +++ b/omnithread/posix.cc @@ -49,7 +49,7 @@ #include <stdlib.h> #include <errno.h> #include <time.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #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 b0139d29d..eedaaa99f 100644 --- a/omnithread/solaris.cc +++ b/omnithread/solaris.cc @@ -26,7 +26,7 @@ #include <stdlib.h> #include <errno.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #define DB(x) // x // #include <iostream> or #include <iostream.h> if DB is on. diff --git a/omnithread/vxWorks.cc b/omnithread/vxWorks.cc index 25634ce93..aaff6cdb2 100644 --- a/omnithread/vxWorks.cc +++ b/omnithread/vxWorks.cc @@ -56,7 +56,7 @@ #include <stdio.h> #include <errno.h> #include <time.h> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <sysLib.h> #include <assert.h> // assert diff --git a/pmt/src/lib/pmt_pool.h b/pmt/src/lib/pmt_pool.h index 42276a14f..dd63d44a6 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 <cstddef> -#include <omnithread.h> +#include <gnuradio/omnithread.h> #include <vector> /*! diff --git a/usrp/host/lib/legacy/mld_threads.h b/usrp/host/lib/legacy/mld_threads.h index b2ec65751..322f557b6 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 <omnithread.h> +#include <gnuradio/omnithread.h> #else #include <pthread.h> #endif diff --git a/usrp2/host/lib/control.cc b/usrp2/host/lib/control.cc index 97d969fa6..4b8597c60 100644 --- a/usrp2/host/lib/control.cc +++ b/usrp2/host/lib/control.cc @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <omni_time.h> +#include <gnuradio/omni_time.h> #include "control.h" #include <iostream> diff --git a/usrp2/host/lib/control.h b/usrp2/host/lib/control.h index 33f73fa94..0e8fcfe57 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <usrp2_eth_packet.h> namespace usrp2 { diff --git a/usrp2/host/lib/ring.h b/usrp2/host/lib/ring.h index 2f4346ca6..19ae9ae97 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <stddef.h> #include <vector> #include <boost/shared_ptr.hpp> diff --git a/usrp2/host/lib/usrp2_thread.h b/usrp2/host/lib/usrp2_thread.h index c7f9e1aaf..12723e947 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 <omnithread.h> +#include <gnuradio/omnithread.h> #include <usrp2_impl.h> namespace usrp2 { |