[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10506 - in gnuradio/trunk: config gcell/apps gcell/li
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10506 - in gnuradio/trunk: config gcell/apps gcell/lib/runtime gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gr-audio-osx/src gr-audio-portaudio/src mblock/src/include/mblock mblock/src/lib omnithread omnithread/gnuradio pmt/src/lib usrp/host/lib/legacy usrp2/host/lib |
|
Date: |
Wed, 25 Feb 2009 12:04:36 -0700 (MST) |
Author: jcorgan
Date: 2009-02-25 12:04:35 -0700 (Wed, 25 Feb 2009)
New Revision: 10506
Added:
gnuradio/trunk/omnithread/gnuradio/
gnuradio/trunk/omnithread/gnuradio/Makefile.am
gnuradio/trunk/omnithread/gnuradio/omni_time.h
gnuradio/trunk/omnithread/gnuradio/omnithread.h
gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h
gnuradio/trunk/omnithread/gnuradio/ot_mach.h
gnuradio/trunk/omnithread/gnuradio/ot_nt.h
gnuradio/trunk/omnithread/gnuradio/ot_posix.h
gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h
gnuradio/trunk/omnithread/gnuradio/ot_solaris.h
Removed:
gnuradio/trunk/omnithread/gnuradio/omni_time.h
gnuradio/trunk/omnithread/gnuradio/omnithread.h
gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h
gnuradio/trunk/omnithread/gnuradio/ot_mach.h
gnuradio/trunk/omnithread/gnuradio/ot_nt.h
gnuradio/trunk/omnithread/gnuradio/ot_posix.h
gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h
gnuradio/trunk/omnithread/gnuradio/ot_solaris.h
gnuradio/trunk/omnithread/omni_time.h
gnuradio/trunk/omnithread/omnithread.h
gnuradio/trunk/omnithread/ot_VxThread.h
gnuradio/trunk/omnithread/ot_mach.h
gnuradio/trunk/omnithread/ot_nt.h
gnuradio/trunk/omnithread/ot_posix.h
gnuradio/trunk/omnithread/ot_pthread_nt.h
gnuradio/trunk/omnithread/ot_solaris.h
Modified:
gnuradio/trunk/config/grc_omnithread.m4
gnuradio/trunk/gcell/apps/benchmark_dma.cc
gnuradio/trunk/gcell/apps/benchmark_nop.cc
gnuradio/trunk/gcell/apps/benchmark_roundtrip.cc
gnuradio/trunk/gcell/lib/runtime/gc_client_thread_info.h
gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.h
gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h
gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h
gnuradio/trunk/gnuradio-core/src/lib/io/gr_wavfile_sink.h
gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.h
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.h
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
gnuradio/trunk/gr-audio-osx/src/mld_threads.h
gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.h
gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.h
gnuradio/trunk/mblock/src/include/mblock/msg_queue.h
gnuradio/trunk/mblock/src/include/mblock/runtime.h
gnuradio/trunk/mblock/src/include/mblock/time.h
gnuradio/trunk/mblock/src/lib/mb_runtime_base.h
gnuradio/trunk/mblock/src/lib/mb_runtime_thread_per_block.cc
gnuradio/trunk/mblock/src/lib/mb_worker.h
gnuradio/trunk/omnithread/Makefile.am
gnuradio/trunk/omnithread/mach.cc
gnuradio/trunk/omnithread/nt.cc
gnuradio/trunk/omnithread/omni_time.cc
gnuradio/trunk/omnithread/posix.cc
gnuradio/trunk/omnithread/solaris.cc
gnuradio/trunk/omnithread/vxWorks.cc
gnuradio/trunk/pmt/src/lib/pmt_pool.h
gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h
gnuradio/trunk/usrp2/host/lib/control.cc
gnuradio/trunk/usrp2/host/lib/control.h
gnuradio/trunk/usrp2/host/lib/ring.h
gnuradio/trunk/usrp2/host/lib/usrp2_thread.h
Log:
Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread
header files into /gnuradio. Trunk passes distcheck.
Modified: gnuradio/trunk/config/grc_omnithread.m4
===================================================================
--- gnuradio/trunk/config/grc_omnithread.m4 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/config/grc_omnithread.m4 2009-02-25 19:04:35 UTC (rev
10506)
@@ -35,6 +35,7 @@
AC_CONFIG_FILES([ \
omnithread/Makefile \
+ omnithread/gnuradio/Makefile \
omnithread/gnuradio-omnithread.pc
])
Modified: gnuradio/trunk/gcell/apps/benchmark_dma.cc
===================================================================
--- gnuradio/trunk/gcell/apps/benchmark_dma.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/gcell/apps/benchmark_dma.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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>
Modified: gnuradio/trunk/gcell/apps/benchmark_nop.cc
===================================================================
--- gnuradio/trunk/gcell/apps/benchmark_nop.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/gcell/apps/benchmark_nop.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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>
Modified: gnuradio/trunk/gcell/apps/benchmark_roundtrip.cc
===================================================================
--- gnuradio/trunk/gcell/apps/benchmark_roundtrip.cc 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/gcell/apps/benchmark_roundtrip.cc 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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>
Modified: gnuradio/trunk/gcell/lib/runtime/gc_client_thread_info.h
===================================================================
--- gnuradio/trunk/gcell/lib/runtime/gc_client_thread_info.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gcell/lib/runtime/gc_client_thread_info.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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 {
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_file_sink_base.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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>
/*!
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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>
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_source.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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>
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_wavfile_sink.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_wavfile_sink.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_wavfile_sink.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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;
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gri_logger.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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;
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_msg_queue.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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;
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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
Modified: gnuradio/trunk/gr-audio-osx/src/mld_threads.h
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/mld_threads.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/gr-audio-osx/src/mld_threads.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -29,7 +29,7 @@
#define __macos__
#ifdef _USE_OMNI_THREADS_
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
#else
#include <pthread.h>
#endif
Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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
Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.h
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.h
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.h
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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>
Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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
Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.h
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.h
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.h
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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>
Modified: gnuradio/trunk/mblock/src/include/mblock/msg_queue.h
===================================================================
--- gnuradio/trunk/mblock/src/include/mblock/msg_queue.h 2009-02-25
18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/mblock/src/include/mblock/msg_queue.h 2009-02-25
19:04:35 UTC (rev 10506)
@@ -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>
/*!
Modified: gnuradio/trunk/mblock/src/include/mblock/runtime.h
===================================================================
--- gnuradio/trunk/mblock/src/include/mblock/runtime.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/mblock/src/include/mblock/runtime.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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.
Modified: gnuradio/trunk/mblock/src/include/mblock/time.h
===================================================================
--- gnuradio/trunk/mblock/src/include/mblock/time.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/mblock/src/include/mblock/time.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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 */
Modified: gnuradio/trunk/mblock/src/lib/mb_runtime_base.h
===================================================================
--- gnuradio/trunk/mblock/src/lib/mb_runtime_base.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/mblock/src/lib/mb_runtime_base.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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>
/*
Modified: gnuradio/trunk/mblock/src/lib/mb_runtime_thread_per_block.cc
===================================================================
--- gnuradio/trunk/mblock/src/lib/mb_runtime_thread_per_block.cc
2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/mblock/src/lib/mb_runtime_thread_per_block.cc
2009-02-25 19:04:35 UTC (rev 10506)
@@ -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>
Modified: gnuradio/trunk/mblock/src/lib/mb_worker.h
===================================================================
--- gnuradio/trunk/mblock/src/lib/mb_worker.h 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/mblock/src/lib/mb_worker.h 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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>
Modified: gnuradio/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/omnithread/Makefile.am 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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 @@
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
Copied: gnuradio/trunk/omnithread/gnuradio (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio)
Copied: gnuradio/trunk/omnithread/gnuradio/Makefile.am (from rev 10505,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/Makefile.am)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/Makefile.am
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/Makefile.am 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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
Deleted: gnuradio/trunk/omnithread/gnuradio/omni_time.h
Copied: gnuradio/trunk/omnithread/gnuradio/omni_time.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/omni_time.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/omni_time.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/omni_time.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,89 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef INCLUDED_OMNI_TIME_H
+#define INCLUDED_OMNI_TIME_H
+
+struct omni_time {
+ long int d_secs; // seconds.
+ long int d_nsecs; // nanoseconds. Always in [0, 1e9-1]
+
+ omni_time() : d_secs(0), d_nsecs(0) {}
+ omni_time(long secs, long nanosecs=0) : d_secs(secs), d_nsecs(nanosecs) {}
+
+ // N.B., this only makes sense for differences between times.
+ // Double doesn't have enough bits to precisely represent an absolute time.
+ omni_time(double secs);
+
+ // N.B. This only makes sense for differences between times.
+ // Double doesn't have enough bits to precisely represent an absolute time.
+ double double_time() const { return (double)d_secs + d_nsecs * 1e-9; }
+
+ /*!
+ * \brief Return an absolute time suitable for use with
+ * schedule_one_shot_timeout & schedule_periodic_timeout
+ *
+ * The return value is the current time plus the given relative offset.
+ */
+ static omni_time time(const omni_time &relative_offset = omni_time());
+};
+
+
+inline static bool
+operator<(const omni_time &x, const omni_time &y)
+{
+ return ((x.d_secs < y.d_secs)
+ || (x.d_secs == y.d_secs && x.d_nsecs < y.d_nsecs));
+}
+
+inline static bool
+operator>(const omni_time &x, const omni_time &y)
+{
+ return ((x.d_secs > y.d_secs)
+ || (x.d_secs == y.d_secs && x.d_nsecs > y.d_nsecs));
+}
+
+inline static bool
+operator>=(const omni_time &x, const omni_time &y)
+{
+ return ((x.d_secs > y.d_secs)
+ || (x.d_secs == y.d_secs && x.d_nsecs >= y.d_nsecs));
+}
+
+inline static bool
+operator<=(const omni_time &x, const omni_time &y)
+{
+ return ((x.d_secs < y.d_secs)
+ || (x.d_secs == y.d_secs && x.d_nsecs <= y.d_nsecs));
+}
+
+inline static bool
+operator==(const omni_time &x, const omni_time &y)
+{
+ return (x.d_secs == y.d_secs && x.d_nsecs == y.d_nsecs);
+}
+
+
+omni_time operator+(const omni_time &x, const omni_time &y);
+omni_time operator+(const omni_time &x, double y);
+omni_time operator-(const omni_time &x, const omni_time &y);
+omni_time operator-(const omni_time &x, double y);
+
+#endif /* INCLUDED_OMNI_TIME_H */
Deleted: gnuradio/trunk/omnithread/gnuradio/omnithread.h
Copied: gnuradio/trunk/omnithread/gnuradio/omnithread.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/omnithread.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/omnithread.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/omnithread.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,626 @@
+// -*- Mode: C++; -*-
+// Package : omnithread
+// omnithread.h Created : 7/94 tjr
+//
+// Copyright (C) 2006 Free Software Foundation, Inc.
+// Copyright (C) 1994,1995,1996, 1997 Olivetti & Oracle Research Laboratory
+//
+// This file is part of the omnithread library
+//
+// The omnithread library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library 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
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA
+//
+
+//
+// Interface to OMNI thread abstraction.
+//
+// This file declares classes for threads and synchronisation objects
+// (mutexes, condition variables and counting semaphores).
+//
+// Wherever a seemingly arbitrary choice has had to be made as to the interface
+// provided, the intention here has been to be as POSIX-like as possible. This
+// is why there is no semaphore timed wait, for example.
+//
+
+#ifndef __omnithread_h_
+#define __omnithread_h_
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+class omni_mutex;
+class omni_condition;
+class omni_semaphore;
+class omni_thread;
+
+//
+// OMNI_THREAD_EXPOSE can be defined as public or protected to expose the
+// implementation class - this may be useful for debugging. Hopefully this
+// won't change the underlying structure which the compiler generates so that
+// this can work without recompiling the library.
+//
+
+#ifndef OMNI_THREAD_EXPOSE
+#define OMNI_THREAD_EXPOSE private
+#endif
+
+//
+// Include implementation-specific header file.
+//
+// This must define 4 CPP macros of the form OMNI_x_IMPLEMENTATION for mutex,
+// condition variable, semaphore and thread. Each should define any
+// implementation-specific members of the corresponding classes.
+//
+
+
+//
+// For now, we assume they've always got a Posix Threads implementation.
+// If not, it'll take some configure hacking to sort it out, along with
+// the relevant libraries to link with, etc.
+//
+
+#if !defined(OMNITHREAD_POSIX) && !defined(OMNITHREAD_NT) && defined
HAVE_CONFIG_H
+// #include <config.h> // No, No, No! Never include <config.h> from a
header
+#endif
+
+#if defined(OMNITHREAD_POSIX)
+#include <gnuradio/ot_posix.h>
+
+#elif defined(OMNITHREAD_NT)
+#include <gnuradio/ot_nt.h>
+
+#ifdef _MSC_VER
+
+// Using MSVC++ to compile. If compiling library as a DLL,
+// define _OMNITHREAD_DLL. If compiling as a statuc library, define
+// _WINSTATIC
+// If compiling an application that is to be statically linked to omnithread,
+// define _WINSTATIC (if the application is to be dynamically linked,
+// there is no need to define any of these macros).
+
+#if defined (_OMNITHREAD_DLL) && defined(_WINSTATIC)
+#error "Both _OMNITHREAD_DLL and _WINSTATIC are defined."
+#elif defined(_OMNITHREAD_DLL)
+#define _OMNITHREAD_NTDLL_ __declspec(dllexport)
+#elif !defined(_WINSTATIC)
+#define _OMNITHREAD_NTDLL_ __declspec(dllimport)
+#elif defined(_WINSTATIC)
+#define _OMNITHREAD_NTDLL_
+#endif
+ // _OMNITHREAD_DLL && _WINSTATIC
+
+#else
+
+// Not using MSVC++ to compile
+#define _OMNITHREAD_NTDLL_
+
+#endif
+ // _MSC_VER
+
+#elif defined(__vxWorks__)
+#include <gnuradio/ot_VxThread.h>
+
+#elif defined(__sunos__)
+#if __OSVERSION__ != 5
+// XXX Workaround for SUN C++ compiler (seen on 4.2) Template.DB code
+// regeneration bug. See omniORB2/CORBA_sysdep.h for details.
+#if !defined(__SUNPRO_CC) || __OSVERSION__ != '5'
+#error "Only SunOS 5.x or later is supported."
+#endif
+#endif
+#ifdef UseSolarisThreads
+#include <gnuradio/ot_solaris.h>
+#else
+#include <gnuradio/ot_posix.h>
+#endif
+
+#elif defined(__rtems__)
+#include <gnuradio/ot_posix.h>
+#include <sched.h>
+
+#elif defined(__macos__)
+#include <gnuradio/ot_posix.h>
+#include <sched.h>
+
+#else
+#error "No implementation header file"
+#endif
+
+
+#if !defined(__WIN32__)
+#define _OMNITHREAD_NTDLL_
+#endif
+
+#if (!defined(OMNI_MUTEX_IMPLEMENTATION) || \
+ !defined(OMNI_MUTEX_LOCK_IMPLEMENTATION) || \
+ !defined(OMNI_MUTEX_TRYLOCK_IMPLEMENTATION)|| \
+ !defined(OMNI_MUTEX_UNLOCK_IMPLEMENTATION) || \
+ !defined(OMNI_CONDITION_IMPLEMENTATION) || \
+ !defined(OMNI_SEMAPHORE_IMPLEMENTATION) || \
+ !defined(OMNI_THREAD_IMPLEMENTATION))
+#error "Implementation header file incomplete"
+#endif
+
+
+//
+// This exception is thrown in the event of a fatal error.
+//
+
+class _OMNITHREAD_NTDLL_ omni_thread_fatal {
+public:
+ int error;
+ omni_thread_fatal(int e = 0) : error(e) {}
+};
+
+
+//
+// This exception is thrown when an operation is invoked with invalid
+// arguments.
+//
+
+class _OMNITHREAD_NTDLL_ omni_thread_invalid {};
+
+
+///////////////////////////////////////////////////////////////////////////
+//
+// Mutex
+//
+///////////////////////////////////////////////////////////////////////////
+
+class _OMNITHREAD_NTDLL_ omni_mutex {
+
+public:
+ omni_mutex(void);
+ ~omni_mutex(void);
+
+ inline void lock(void) { OMNI_MUTEX_LOCK_IMPLEMENTATION }
+ inline void unlock(void) { OMNI_MUTEX_UNLOCK_IMPLEMENTATION }
+ inline int trylock(void) { return OMNI_MUTEX_TRYLOCK_IMPLEMENTATION }
+ // if mutex is unlocked, lock it and return 1 (true).
+ // If it's already locked then return 0 (false).
+
+ inline void acquire(void) { lock(); }
+ inline void release(void) { unlock(); }
+ // the names lock and unlock are preferred over acquire and release
+ // since we are attempting to be as POSIX-like as possible.
+
+ friend class omni_condition;
+
+private:
+ // dummy copy constructor and operator= to prevent copying
+ omni_mutex(const omni_mutex&);
+ omni_mutex& operator=(const omni_mutex&);
+
+OMNI_THREAD_EXPOSE:
+ OMNI_MUTEX_IMPLEMENTATION
+};
+
+//
+// As an alternative to:
+// {
+// mutex.lock();
+// .....
+// mutex.unlock();
+// }
+//
+// you can use a single instance of the omni_mutex_lock class:
+//
+// {
+// omni_mutex_lock l(mutex);
+// ....
+// }
+//
+// This has the advantage that mutex.unlock() will be called automatically
+// when an exception is thrown.
+//
+
+class _OMNITHREAD_NTDLL_ omni_mutex_lock {
+ omni_mutex& mutex;
+public:
+ omni_mutex_lock(omni_mutex& m) : mutex(m) { mutex.lock(); }
+ ~omni_mutex_lock(void) { mutex.unlock(); }
+private:
+ // dummy copy constructor and operator= to prevent copying
+ omni_mutex_lock(const omni_mutex_lock&);
+ omni_mutex_lock& operator=(const omni_mutex_lock&);
+};
+
+
+///////////////////////////////////////////////////////////////////////////
+//
+// Condition variable
+//
+///////////////////////////////////////////////////////////////////////////
+
+class _OMNITHREAD_NTDLL_ omni_condition {
+
+ omni_mutex* mutex;
+
+public:
+ omni_condition(omni_mutex* m);
+ // constructor must be given a pointer to an existing mutex. The
+ // condition variable is then linked to the mutex, so that there is an
+ // implicit unlock and lock around wait() and timed_wait().
+
+ ~omni_condition(void);
+
+ void wait(void);
+ // wait for the condition variable to be signalled. The mutex is
+ // implicitly released before waiting and locked again after waking up.
+ // If wait() is called by multiple threads, a signal may wake up more
+ // than one thread. See POSIX threads documentation for details.
+
+ int timedwait(unsigned long secs, unsigned long nanosecs = 0);
+ // timedwait() is given an absolute time to wait until. To wait for a
+ // relative time from now, use omni_thread::get_time. See POSIX threads
+ // documentation for why absolute times are better than relative.
+ // Returns 1 (true) if successfully signalled, 0 (false) if time
+ // expired.
+
+ void signal(void);
+ // if one or more threads have called wait(), signal wakes up at least
+ // one of them, possibly more. See POSIX threads documentation for
+ // details.
+
+ void broadcast(void);
+ // broadcast is like signal but wakes all threads which have called
+ // wait().
+
+private:
+ // dummy copy constructor and operator= to prevent copying
+ omni_condition(const omni_condition&);
+ omni_condition& operator=(const omni_condition&);
+
+OMNI_THREAD_EXPOSE:
+ OMNI_CONDITION_IMPLEMENTATION
+};
+
+
+///////////////////////////////////////////////////////////////////////////
+//
+// Counting (or binary) semaphore
+//
+///////////////////////////////////////////////////////////////////////////
+
+class _OMNITHREAD_NTDLL_ omni_semaphore {
+
+public:
+ // if max_count == 1, you've got a binary semaphore.
+ omni_semaphore(unsigned int initial = 1, unsigned int max_count =
0x7fffffff);
+ ~omni_semaphore(void);
+
+ void wait(void);
+ // if semaphore value is > 0 then decrement it and carry on. If it's
+ // already 0 then block.
+
+ int trywait(void);
+ // if semaphore value is > 0 then decrement it and return 1 (true).
+ // If it's already 0 then return 0 (false).
+
+ void post(void);
+ // if any threads are blocked in wait(), wake one of them up. Otherwise
+ // increment the value of the semaphore.
+
+private:
+ // dummy copy constructor and operator= to prevent copying
+ omni_semaphore(const omni_semaphore&);
+ omni_semaphore& operator=(const omni_semaphore&);
+
+OMNI_THREAD_EXPOSE:
+ OMNI_SEMAPHORE_IMPLEMENTATION
+};
+
+//
+// A helper class for semaphores, similar to omni_mutex_lock above.
+//
+
+class _OMNITHREAD_NTDLL_ omni_semaphore_lock {
+ omni_semaphore& sem;
+public:
+ omni_semaphore_lock(omni_semaphore& s) : sem(s) { sem.wait(); }
+ ~omni_semaphore_lock(void) { sem.post(); }
+private:
+ // dummy copy constructor and operator= to prevent copying
+ omni_semaphore_lock(const omni_semaphore_lock&);
+ omni_semaphore_lock& operator=(const omni_semaphore_lock&);
+};
+
+
+///////////////////////////////////////////////////////////////////////////
+//
+// Thread
+//
+///////////////////////////////////////////////////////////////////////////
+
+class _OMNITHREAD_NTDLL_ omni_thread {
+
+public:
+
+ enum priority_t {
+ PRIORITY_LOW,
+ PRIORITY_NORMAL,
+ PRIORITY_HIGH
+ };
+
+ enum state_t {
+ STATE_NEW, // thread object exists but thread hasn't
+ // started yet.
+ STATE_RUNNING, // thread is running.
+ STATE_TERMINATED // thread has terminated but storage has not
+ // been reclaimed (i.e. waiting to be joined).
+ };
+
+ //
+ // Constructors set up the thread object but the thread won't start until
+ // start() is called. The create method can be used to construct and start
+ // a thread in a single call.
+ //
+
+ omni_thread(void (*fn)(void*), void* arg = NULL,
+ priority_t pri = PRIORITY_NORMAL);
+ omni_thread(void* (*fn)(void*), void* arg = NULL,
+ priority_t pri = PRIORITY_NORMAL);
+ // these constructors create a thread which will run the given function
+ // when start() is called. The thread will be detached if given a
+ // function with void return type, undetached if given a function
+ // returning void*. If a thread is detached, storage for the thread is
+ // reclaimed automatically on termination. Only an undetached thread
+ // can be joined.
+
+ void start(void);
+ // start() causes a thread created with one of the constructors to
+ // start executing the appropriate function.
+
+protected:
+
+ omni_thread(void* arg = NULL, priority_t pri = PRIORITY_NORMAL);
+ // this constructor is used in a derived class. The thread will
+ // execute the run() or run_undetached() member functions depending on
+ // whether start() or start_undetached() is called respectively.
+
+public:
+
+ void start_undetached(void);
+ // can be used with the above constructor in a derived class to cause
+ // the thread to be undetached. In this case the thread executes the
+ // run_undetached member function.
+
+protected:
+
+ virtual ~omni_thread(void);
+ // destructor cannot be called by user (except via a derived class).
+ // Use exit() or cancel() instead. This also means a thread object must
+ // be allocated with new - it cannot be statically or automatically
+ // allocated. The destructor of a class that inherits from omni_thread
+ // shouldn't be public either (otherwise the thread object can be
+ // destroyed while the underlying thread is still running).
+
+public:
+
+ void join(void**);
+ // join causes the calling thread to wait for another's completion,
+ // putting the return value in the variable of type void* whose address
+ // is given (unless passed a null pointer). Only undetached threads
+ // may be joined. Storage for the thread will be reclaimed.
+
+ void set_priority(priority_t);
+ // set the priority of the thread.
+
+ static omni_thread* create(void (*fn)(void*), void* arg = NULL,
+ priority_t pri = PRIORITY_NORMAL);
+ static omni_thread* create(void* (*fn)(void*), void* arg = NULL,
+ priority_t pri = PRIORITY_NORMAL);
+ // create spawns a new thread executing the given function with the
+ // given argument at the given priority. Returns a pointer to the
+ // thread object. It simply constructs a new thread object then calls
+ // start.
+
+ static void exit(void* return_value = NULL);
+ // causes the calling thread to terminate.
+
+ static omni_thread* self(void);
+ // returns the calling thread's omni_thread object. If the
+ // calling thread is not the main thread and is not created
+ // using this library, returns 0. (But see create_dummy()
+ // below.)
+
+ static void yield(void);
+ // allows another thread to run.
+
+ static void sleep(unsigned long secs, unsigned long nanosecs = 0);
+ // sleeps for the given time.
+
+ static void get_time(unsigned long* abs_sec, unsigned long* abs_nsec,
+ unsigned long rel_sec = 0, unsigned long rel_nsec=0);
+ // calculates an absolute time in seconds and nanoseconds, suitable for
+ // use in timed_waits on condition variables, which is the current time
+ // plus the given relative offset.
+
+
+ static void stacksize(unsigned long sz);
+ static unsigned long stacksize();
+ // Use this value as the stack size when spawning a new thread.
+ // The default value (0) means that the thread library default is
+ // to be used.
+
+
+ // Per-thread data
+ //
+ // These functions allow you to attach additional data to an
+ // omni_thread. First allocate a key for yourself with
+ // allocate_key(). Then you can store any object whose class is
+ // derived from value_t. Any values still stored in the
+ // omni_thread when the thread exits are deleted.
+ //
+ // These functions are NOT thread safe, so you should be very
+ // careful about setting/getting data in a different thread to the
+ // current thread.
+
+ typedef unsigned int key_t;
+ static key_t allocate_key();
+
+ class value_t {
+ public:
+ virtual ~value_t() {}
+ };
+
+ value_t* set_value(key_t k, value_t* v);
+ // Sets a value associated with the given key. The key must
+ // have been allocated with allocate_key(). If a value has
+ // already been set with the specified key, the old value_t
+ // object is deleted and replaced. Returns the value which was
+ // set, or zero if the key is invalid.
+
+ value_t* get_value(key_t k);
+ // Returns the value associated with the key. If the key is
+ // invalid, or there is no value for the key, returns zero.
+
+ value_t* remove_value(key_t k);
+ // Removes the value associated with the key and returns it.
+ // If the key is invalid, or there is no value for the key,
+ // returns zero.
+
+
+ // Dummy omni_thread
+ //
+ // Sometimes, an application finds itself with threads created
+ // outside of omnithread which must interact with omnithread
+ // features such as the per-thread data. In this situation,
+ // omni_thread::self() would normally return 0. These functions
+ // allow the application to create a suitable dummy omni_thread
+ // object.
+
+ static omni_thread* create_dummy(void);
+ // creates a dummy omni_thread for the calling thread. Future
+ // calls to self() will return the dummy omni_thread. Throws
+ // omni_thread_invalid if this thread already has an
+ // associated omni_thread (real or dummy).
+
+ static void release_dummy();
+ // release the dummy omni_thread for this thread. This
+ // function MUST be called before the thread exits. Throws
+ // omni_thread_invalid if the calling thread does not have a
+ // dummy omni_thread.
+
+ // class ensure_self should be created on the stack. If created in
+ // a thread without an associated omni_thread, it creates a dummy
+ // thread which is released when the ensure_self object is deleted.
+
+ class ensure_self {
+ public:
+ inline ensure_self() : _dummy(0)
+ {
+ _self = omni_thread::self();
+ if (!_self) {
+ _dummy = 1;
+ _self = omni_thread::create_dummy();
+ }
+ }
+ inline ~ensure_self()
+ {
+ if (_dummy)
+ omni_thread::release_dummy();
+ }
+ inline omni_thread* self() { return _self; }
+ private:
+ omni_thread* _self;
+ int _dummy;
+ };
+
+
+private:
+
+ virtual void run(void* /*arg*/) {}
+ virtual void* run_undetached(void* /*arg*/) { return NULL; }
+ // can be overridden in a derived class. When constructed using the
+ // the constructor omni_thread(void*, priority_t), these functions are
+ // called by start() and start_undetached() respectively.
+
+ void common_constructor(void* arg, priority_t pri, int det);
+ // implements the common parts of the constructors.
+
+ omni_mutex mutex;
+ // used to protect any members which can change after construction,
+ // i.e. the following 2 members.
+
+ state_t _state;
+ priority_t _priority;
+
+ static omni_mutex* next_id_mutex;
+ static int next_id;
+ int _id;
+
+ void (*fn_void)(void*);
+ void* (*fn_ret)(void*);
+ void* thread_arg;
+ int detached;
+ int _dummy;
+ value_t** _values;
+ unsigned long _value_alloc;
+
+ omni_thread(const omni_thread&);
+ omni_thread& operator=(const omni_thread&);
+ // Not implemented
+
+public:
+
+ priority_t priority(void) {
+
+ // return this thread's priority.
+
+ omni_mutex_lock l(mutex);
+ return _priority;
+ }
+
+ state_t state(void) {
+
+ // return thread state (invalid, new, running or terminated).
+
+ omni_mutex_lock l(mutex);
+ return _state;
+ }
+
+ int id(void) { return _id; }
+ // return unique thread id within the current process.
+
+
+ // This class plus the instance of it declared below allows us to execute
+ // some initialisation code before main() is called.
+
+ class _OMNITHREAD_NTDLL_ init_t {
+ public:
+ init_t(void);
+ ~init_t(void);
+ };
+
+ friend class init_t;
+ friend class omni_thread_dummy;
+
+OMNI_THREAD_EXPOSE:
+ OMNI_THREAD_IMPLEMENTATION
+};
+
+#ifndef __rtems__
+static omni_thread::init_t omni_thread_init;
+#else
+// RTEMS calls global Ctor/Dtor in a context that is not
+// a posix thread. Calls to functions to pthread_self() in
+// that context returns NULL.
+// So, for RTEMS we will make the thread initialization at the
+// beginning of the Init task that has a posix context.
+#endif
+
+#endif
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_VxThread.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_VxThread.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,118 @@
+#ifndef __VXTHREAD_H__
+#define __VXTHREAD_H__
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Project: omniORB
+%% Filename: $Filename$
+%% Author: Guillaume/Bill ARRECKX
+%% Copyright Wavetek Wandel & Goltermann, Plymouth.
+%% Description: OMNI thread implementation classes for VxWorks threads
+%% Notes:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% $Log$
+%% Revision 1.1 2004/04/10 18:00:52 eb
+%% Initial revision
+%%
+%% Revision 1.1.1.1 2004/03/01 00:20:27 eb
+%% initial checkin
+%%
+%% Revision 1.1 2003/05/25 05:29:04 eb
+%% see ChangeLog
+%%
+%% Revision 1.1.2.1 2003/02/17 02:03:07 dgrisby
+%% vxWorks port. (Thanks Michael Sturm / Acterna Eningen GmbH).
+%%
+%% Revision 1.1.1.1 2002/11/19 14:55:21 sokcevti
+%% OmniOrb4.0.0 VxWorks port
+%%
+%% Revision 1.2 2002/06/14 12:45:50 engeln
+%% unnecessary members in condition removed.
+%% ---
+%%
+%% Revision 1.1.1.1 2002/04/02 10:08:49 sokcevti
+%% omniORB4 initial realease
+%%
+%% Revision 1.1 2001/03/23 16:50:23 hartmut
+%% Initial Version 2.8
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+*/
+
+
+///////////////////////////////////////////////////////////////////////////
+// Includes
+///////////////////////////////////////////////////////////////////////////
+#include <vxWorks.h>
+#include <semLib.h>
+#include <taskLib.h>
+
+
+///////////////////////////////////////////////////////////////////////////
+// Externs prototypes
+///////////////////////////////////////////////////////////////////////////
+extern "C" void omni_thread_wrapper(void* ptr);
+
+
+///////////////////////////////////////////////////////////////////////////
+// Exported macros
+// Note: These are added as private members in each class implementation.
+///////////////////////////////////////////////////////////////////////////
+#define OMNI_MUTEX_IMPLEMENTATION \
+ SEM_ID mutexID; \
+ bool m_bConstructed;
+
+#define OMNI_CONDITION_IMPLEMENTATION \
+ long waiters_; \
+ SEM_ID waiters_lock_; \
+ SEM_ID sema_;
+
+#define OMNI_SEMAPHORE_IMPLEMENTATION \
+ SEM_ID semID;
+
+#define OMNI_MUTEX_LOCK_IMPLEMENTATION \
+ if(semTake(mutexID, WAIT_FOREVER) != OK) \
+ { \
+ throw omni_thread_fatal(errno); \
+ }
+
+#define OMNI_MUTEX_UNLOCK_IMPLEMENTATION \
+ if(semGive(mutexID) != OK) \
+ { \
+ throw omni_thread_fatal(errno); \
+ }
+
+#define OMNI_THREAD_IMPLEMENTATION \
+ friend void omni_thread_wrapper(void* ptr); \
+ static int vxworks_priority(priority_t); \
+ omni_condition *running_cond; \
+ void* return_val; \
+ int tid; \
+ public: \
+ static void attach(void); \
+ static void detach(void); \
+ static void show(void);
+
+
+///////////////////////////////////////////////////////////////////////////
+// Porting macros
+///////////////////////////////////////////////////////////////////////////
+// This is a wrapper function for the 'main' function which does not exists
+// as such in VxWorks. The wrapper creates a launch function instead,
+// which spawns the application wrapped in a omni_thread.
+// Argc will always be null.
+///////////////////////////////////////////////////////////////////////////
+#define main( discarded_argc, discarded_argv ) \
+ omni_discard_retval() \
+ { \
+ throw; \
+ } \
+ int omni_main( int argc, char **argv ); \
+ void launch( ) \
+ { \
+ omni_thread* th = new omni_thread( (void(*)(void*))omni_main );\
+ th->start();\
+ }\
+ int omni_main( int argc, char **argv )
+
+
+#endif // ndef __VXTHREAD_H__
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_mach.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_mach.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_mach.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_mach.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_mach.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,51 @@
+// Package : omnithread
+// omnithread/posix.h Created : 7/97 lars immisch address@hidden
+//
+// Copyright (C) 1994,1995,1996, 1997 Immisch, becker & Partner
+//
+// This file is part of the omnithread library
+//
+// The omnithread library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library 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
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA
+//
+//
+// OMNI thread implementation classes for posix threads
+//
+
+#ifndef __omnithread_mach_h_
+#define __omnithread_mach_h_
+
+#include <mach/cthreads.h>
+
+extern "C" void* omni_thread_wrapper(void* ptr);
+
+#define OMNI_MUTEX_IMPLEMENTATION \
+ struct mutex mach_mutex;
+
+#define OMNI_CONDITION_IMPLEMENTATION \
+ struct condition mach_cond;
+
+#define OMNI_SEMAPHORE_IMPLEMENTATION \
+ omni_mutex m; \
+ omni_condition c; \
+ int value;
+
+
+#define OMNI_THREAD_IMPLEMENTATION \
+ cthread_t mach_thread; \
+ static int mach_priority(priority_t); \
+ friend void* omni_thread_wrapper(void* ptr);
+
+#endif
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_nt.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_nt.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_nt.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_nt.h (rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_nt.h 2009-02-25 19:04:35 UTC (rev
10506)
@@ -0,0 +1,85 @@
+// Package : omnithread
+// omnithread/nt.h Created : 6/95 tjr
+//
+// Copyright (C) 1995, 1996, 1997 Olivetti & Oracle Research Laboratory
+//
+// This file is part of the omnithread library
+//
+// The omnithread library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library 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
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA
+//
+//
+// OMNI thread implementation classes for NT threads.
+//
+
+#ifndef __omnithread_nt_h_
+#define __omnithread_nt_h_
+
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# define OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#ifdef OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+# undef OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+#endif
+
+
+#ifndef __BCPLUSPLUS__
+#define OMNI_THREAD_WRAPPER \
+ unsigned __stdcall omni_thread_wrapper(LPVOID ptr);
+#else
+#define OMNI_THREAD_WRAPPER \
+ void _USERENTRY omni_thread_wrapper(void *ptr);
+#endif
+
+extern "C" OMNI_THREAD_WRAPPER;
+
+#define OMNI_MUTEX_IMPLEMENTATION \
+ CRITICAL_SECTION crit;
+
+#define OMNI_MUTEX_LOCK_IMPLEMENTATION \
+ EnterCriticalSection(&crit);
+
+#define OMNI_MUTEX_TRYLOCK_IMPLEMENTATION \
+ TryEnterCriticalSection(&crit);
+
+#define OMNI_MUTEX_UNLOCK_IMPLEMENTATION \
+ LeaveCriticalSection(&crit);
+
+#define OMNI_CONDITION_IMPLEMENTATION \
+ CRITICAL_SECTION crit; \
+ omni_thread* waiting_head; \
+ omni_thread* waiting_tail;
+
+#define OMNI_SEMAPHORE_IMPLEMENTATION \
+ HANDLE nt_sem;
+
+#define OMNI_THREAD_IMPLEMENTATION \
+ HANDLE handle; \
+ DWORD nt_id; \
+ void* return_val; \
+ HANDLE cond_semaphore; \
+ omni_thread* cond_next; \
+ omni_thread* cond_prev; \
+ BOOL cond_waiting; \
+ static int nt_priority(priority_t); \
+ friend class omni_condition; \
+ friend OMNI_THREAD_WRAPPER;
+
+#endif
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_posix.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_posix.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_posix.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_posix.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_posix.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,81 @@
+// Package : omnithread
+// omnithread/posix.h Created : 7/94 tjr
+//
+// Copyright (C) 2006 Free Software Foundation, Inc.
+// Copyright (C) 1994,1995,1996, 1997 Olivetti & Oracle Research Laboratory
+//
+// This file is part of the omnithread library
+//
+// The omnithread library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library 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
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA
+//
+//
+// OMNI thread implementation classes for posix threads
+//
+
+#ifndef __omnithread_posix_h_
+#define __omnithread_posix_h_
+
+#if defined(__alpha__) && defined(__osf1__) || defined(__hpux__)
+// stop unnecessary definitions of TRY, etc on OSF
+#ifndef EXC_HANDLING
+#define EXC_HANDLING
+#endif
+#endif
+
+#ifndef __POSIX_NT__
+# include <pthread.h>
+#else
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# define OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+# endif
+# include <windows.h>
+# include "pthread_nt.h"
+# ifdef OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+# undef OMNI_DEFINED_WIN32_LEAN_AND_MEAN
+# endif
+#endif
+
+extern "C" void* omni_thread_wrapper(void* ptr);
+
+#define OMNI_MUTEX_IMPLEMENTATION \
+ pthread_mutex_t posix_mutex;
+
+#define OMNI_MUTEX_LOCK_IMPLEMENTATION \
+ pthread_mutex_lock(&posix_mutex);
+
+#define OMNI_MUTEX_TRYLOCK_IMPLEMENTATION \
+ (pthread_mutex_trylock(&posix_mutex)==0);
+
+#define OMNI_MUTEX_UNLOCK_IMPLEMENTATION \
+ pthread_mutex_unlock(&posix_mutex);
+
+#define OMNI_CONDITION_IMPLEMENTATION \
+ pthread_cond_t posix_cond;
+
+#define OMNI_SEMAPHORE_IMPLEMENTATION \
+ omni_mutex m; \
+ omni_condition c; \
+ int value; \
+ int max_count;
+
+#define OMNI_THREAD_IMPLEMENTATION \
+ pthread_t posix_thread; \
+ static int posix_priority(priority_t); \
+ friend void* omni_thread_wrapper(void* ptr);
+
+#endif
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_pthread_nt.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_pthread_nt.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,186 @@
+/* Package : omnithread
+ omnithread/pthread_nt.h Created : Steven Brenneis <address@hidden>
+
+ Copyright (C) 1998 Steven Brennes
+
+ This file is part of the omnithread library
+
+ The omnithread library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Boston, MA
+ 02110-1301, USA
+
+ Posix Threads implementation for Windows NT, version 4.0
+*/
+
+#ifndef PTHREAD_NT_H_INCLUDED
+#define PTHREAD_NT_H_INCLUDED
+
+#include <errno.h>
+
+#ifndef ETIMEDOUT
+// May have to be changed if NT starts supporting more errno values
+#define ETIMEDOUT 60
+#endif
+
+#undef PthreadDraftVersion
+#define PthreadDraftVersion 10
+
+#define NoNanoSleep
+
+#define PthreadSupportThreadPriority
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _TIMERS_T_
+#define _TIMERS_T_
+ typedef struct timespec {
+ unsigned long tv_sec;
+ long tv_nsec;
+ } timespec_t;
+#endif
+
+typedef char* __pthreadLongString_t;
+typedef void* __pthreadLongAddr_t;
+typedef __pthreadLongAddr_t* __pthreadLongAddr_p;
+typedef long __pthreadLongInt_t;
+typedef unsigned long __pthreadLongUint_t;
+typedef __pthreadLongAddr_p __pthreadTsd_t;
+
+typedef struct __pthread_mutex_t {
+ unsigned int lock; /* LOCK, SLOW, TYPE, RECURSIVE */
+ unsigned int valid; /* Validation info */
+ __pthreadLongString_t name; /* Name of mutex */
+ unsigned int arg; /* printf argument for name */
+ unsigned int depth; /* Recursive lock depth */
+ unsigned long sequence; /* Mutex sequence number */
+ unsigned long owner; /* Current owner (if known */
+ __pthreadLongAddr_t block; /* Pointer to blocking struct */
+} pthread_mutex_t;
+
+typedef struct __pthread_mutexattr_t {
+ long valid;
+ __pthreadLongUint_t reserved[15];
+} pthread_mutexattr_t;
+
+typedef struct __pthread_cond_t {
+ unsigned int state; /* EVENT, SLOW, REFCNT */
+ unsigned int valid; /* Validation info */
+ __pthreadLongString_t name; /* Name of condition variable */
+ unsigned int arg; /* printf argument for name */
+ unsigned long sequence; /* Condition variable seq # */
+ __pthreadLongAddr_t block; /* Pointer to blocking struct */
+} pthread_cond_t ;
+
+typedef struct __pthread_condattr_t {
+ long valid;
+ __pthreadLongUint_t reserved[13];
+} pthread_condattr_t ;
+
+typedef struct __pthread_transp_t {
+ __pthreadLongAddr_t reserved1; /* Reserved to posix_nt */
+ __pthreadLongAddr_t reserved2; /* Reserved to posix_nt */
+ unsigned short size; /* Size of data structure */
+ unsigned char reserved3[2]; /* Reserved to posix_nt */
+ __pthreadLongAddr_t reserved4; /* Reserved to posix_nt */
+ __pthreadLongUint_t sequence; /* Thread sequence number */
+ __pthreadLongUint_t reserved5[2]; /* Reserved to posix_nt */
+ __pthreadLongAddr_t per_kt_area; /* Pointer to kernel context */
+ __pthreadLongAddr_t stack_base; /* Current stack base */
+ __pthreadLongAddr_t stack_reserve; /* Current stack reserve zone */
+ __pthreadLongAddr_t stack_yellow; /* Current stack yellow zone */
+ __pthreadLongAddr_t stack_guard; /* Current stack guard zone */
+ __pthreadLongUint_t stack_size; /* Size of stack */
+ __pthreadTsd_t tsd_values; /* TSD array (indexed by key) */
+ unsigned long tsd_count; /* Number of TSD cells */
+ __pthreadLongAddr_t reserved6; /* Reserved to posix_nt */
+ __pthreadLongAddr_t reserved7; /* Reserved to posix_nt */
+ unsigned int thread_flags; /* Dynamic external state */
+} pthread_transp_t, *pthread_transp_p;
+
+typedef pthread_transp_p pthread_t;
+
+typedef struct __pthread_attr_t {
+ long valid;
+ __pthreadLongString_t name;
+ __pthreadLongUint_t arg;
+ __pthreadLongUint_t reserved[19];
+} pthread_attr_t ;
+
+typedef unsigned int pthread_key_t;
+
+typedef struct sched_param {
+ int sched_priority;
+} sched_param_t;
+
+/* Function Prototypes */
+
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
+ void *(*start_routine)(void*), void *arg);
+int pthread_detach(pthread_t thread);
+int pthread_join(pthread_t thread, void **value_ptr);
+void pthread_exit(void *value_ptr);
+int pthread_attr_init(pthread_attr_t *attr);
+int pthread_attr_destroy(pthread_attr_t *attr);
+int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize);
+int pthread_attr_getstacksize(const pthread_attr_t *attr,
+ size_t *stacksize);
+int pthread_cond_init(pthread_cond_t *cond,
+ const pthread_condattr_t *attr);
+int pthread_cond_destroy(pthread_cond_t *cond);
+int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
+int pthread_cond_timedwait(pthread_cond_t *cond,
+ pthread_mutex_t *mutex,
+ const struct timespec *abstime);
+int pthread_cond_signal(pthread_cond_t *cond);
+int pthread_cond_broadcast(pthread_cond_t *cond);
+int pthread_key_create(pthread_key_t *key, void (*destructor)(void*));
+int pthread_key_delete(pthread_key_t key);
+int pthread_mutex_destroy(pthread_mutex_t *mutex);
+int pthread_mutex_init(pthread_mutex_t *mutex,
+ const pthread_mutexattr_t *attr);
+int pthread_mutex_lock(pthread_mutex_t *mutex);
+int pthread_mutex_trylock(pthread_mutex_t *mutex);
+int pthread_mutex_unlock(pthread_mutex_t *mutex);
+pthread_t pthread_self();
+int pthread_setspecific(pthread_key_t key, const void *value);
+void *pthread_getspecific(pthread_key_t key);
+int pthread_getschedparam(pthread_t thread, int *policy,
+ struct sched_param *param);
+int pthread_setschedparam(pthread_t thread, int policy,
+ const struct sched_param *param);
+int pthread_attr_setschedparam(pthread_attr_t *attr,
+ const struct sched_param *param);
+int pthread_attr_getschedparam(const pthread_attr_t *attr,
+ struct sched_param *param);
+
+int pthread_delay_np(const struct timespec *interval);
+int pthread_get_expiration_np(const struct timespec *delta,
+ struct timespec *abstime);
+
+# define SCHED_FIFO 1
+# define SCHED_RR 2
+# define SCHED_OTHER 3
+
+int sched_yield();
+int sched_get_priority_max(int policy);
+int sched_get_priority_min(int policy);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PTHREAD_NT_H_INCLUDED
Deleted: gnuradio/trunk/omnithread/gnuradio/ot_solaris.h
Copied: gnuradio/trunk/omnithread/gnuradio/ot_solaris.h (from rev 10503,
gnuradio/branches/developers/michaelld/omnithread/omnithread/gnuradio/ot_solaris.h)
===================================================================
--- gnuradio/trunk/omnithread/gnuradio/ot_solaris.h
(rev 0)
+++ gnuradio/trunk/omnithread/gnuradio/ot_solaris.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -0,0 +1,47 @@
+// Package : omnithread
+// omnithread/solaris.h Created : 7/94 tjr
+//
+// Copyright (C) 1994,1995,1996, 1997 Olivetti & Oracle Research Laboratory
+//
+// This file is part of the omnithread library
+//
+// The omnithread library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library 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
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free
+// Software Foundation, Inc., 51 Franklin Street, Boston, MA
+// 02110-1301, USA
+//
+// OMNI thread implementation classes for solaris threads.
+//
+
+#ifndef __omnithread_solaris_h_
+#define __omnithread_solaris_h_
+
+#include <thread.h>
+
+extern "C" void* omni_thread_wrapper(void* ptr);
+
+#define OMNI_MUTEX_IMPLEMENTATION \
+ mutex_t sol_mutex;
+
+#define OMNI_CONDITION_IMPLEMENTATION \
+ cond_t sol_cond;
+
+#define OMNI_SEMAPHORE_IMPLEMENTATION \
+ sema_t sol_sem;
+
+#define OMNI_THREAD_IMPLEMENTATION \
+ thread_t sol_thread; \
+ static int sol_priority(priority_t); \
+ friend void* omni_thread_wrapper(void* ptr);
+
+#endif
Modified: gnuradio/trunk/omnithread/mach.cc
===================================================================
--- gnuradio/trunk/omnithread/mach.cc 2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/omnithread/mach.cc 2009-02-25 19:04:35 UTC (rev 10506)
@@ -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.
Modified: gnuradio/trunk/omnithread/nt.cc
===================================================================
--- gnuradio/trunk/omnithread/nt.cc 2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/omnithread/nt.cc 2009-02-25 19:04:35 UTC (rev 10506)
@@ -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
Modified: gnuradio/trunk/omnithread/omni_time.cc
===================================================================
--- gnuradio/trunk/omnithread/omni_time.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/omnithread/omni_time.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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>
Deleted: gnuradio/trunk/omnithread/omni_time.h
Deleted: gnuradio/trunk/omnithread/omnithread.h
Deleted: gnuradio/trunk/omnithread/ot_VxThread.h
Deleted: gnuradio/trunk/omnithread/ot_mach.h
Deleted: gnuradio/trunk/omnithread/ot_nt.h
Deleted: gnuradio/trunk/omnithread/ot_posix.h
Deleted: gnuradio/trunk/omnithread/ot_pthread_nt.h
Deleted: gnuradio/trunk/omnithread/ot_solaris.h
Modified: gnuradio/trunk/omnithread/posix.cc
===================================================================
--- gnuradio/trunk/omnithread/posix.cc 2009-02-25 18:35:37 UTC (rev 10505)
+++ gnuradio/trunk/omnithread/posix.cc 2009-02-25 19:04:35 UTC (rev 10506)
@@ -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"
Modified: gnuradio/trunk/omnithread/solaris.cc
===================================================================
--- gnuradio/trunk/omnithread/solaris.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/omnithread/solaris.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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.
Modified: gnuradio/trunk/omnithread/vxWorks.cc
===================================================================
--- gnuradio/trunk/omnithread/vxWorks.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/omnithread/vxWorks.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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
Modified: gnuradio/trunk/pmt/src/lib/pmt_pool.h
===================================================================
--- gnuradio/trunk/pmt/src/lib/pmt_pool.h 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/pmt/src/lib/pmt_pool.h 2009-02-25 19:04:35 UTC (rev
10506)
@@ -22,7 +22,7 @@
#define INCLUDED_PMT_POOL_H
#include <cstddef>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
#include <vector>
/*!
Modified: gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/usrp/host/lib/legacy/mld_threads.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -29,7 +29,7 @@
#define __macos__
#ifdef _USE_OMNI_THREADS_
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
#else
#include <pthread.h>
#endif
Modified: gnuradio/trunk/usrp2/host/lib/control.cc
===================================================================
--- gnuradio/trunk/usrp2/host/lib/control.cc 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/usrp2/host/lib/control.cc 2009-02-25 19:04:35 UTC (rev
10506)
@@ -23,7 +23,7 @@
#include <config.h>
#endif
-#include <omni_time.h>
+#include <gnuradio/omni_time.h>
#include "control.h"
#include <iostream>
Modified: gnuradio/trunk/usrp2/host/lib/control.h
===================================================================
--- gnuradio/trunk/usrp2/host/lib/control.h 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/usrp2/host/lib/control.h 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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 {
Modified: gnuradio/trunk/usrp2/host/lib/ring.h
===================================================================
--- gnuradio/trunk/usrp2/host/lib/ring.h 2009-02-25 18:35:37 UTC (rev
10505)
+++ gnuradio/trunk/usrp2/host/lib/ring.h 2009-02-25 19:04:35 UTC (rev
10506)
@@ -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>
Modified: gnuradio/trunk/usrp2/host/lib/usrp2_thread.h
===================================================================
--- gnuradio/trunk/usrp2/host/lib/usrp2_thread.h 2009-02-25 18:35:37 UTC
(rev 10505)
+++ gnuradio/trunk/usrp2/host/lib/usrp2_thread.h 2009-02-25 19:04:35 UTC
(rev 10506)
@@ -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 {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10506 - in gnuradio/trunk: config gcell/apps gcell/lib/runtime gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gr-audio-osx/src gr-audio-portaudio/src mblock/src/include/mblock mblock/src/lib omnithread omnithread/gnuradio pmt/src/lib usrp/host/lib/legacy usrp2/host/lib,
jcorgan <=