diff options
| author | Marcus Müller <mueller@kit.edu> | 2018-03-05 15:30:38 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-03-22 23:29:33 +0100 |
| commit | e0beb54aac18de2f1c3f5076213f03bbe096cd59 (patch) | |
| tree | e4ee3f4fc26bd649b52f18e6430bcd8dcd18ff14 /gnuradio-runtime | |
| parent | d3aba0022c3317bc8856f05612cafcdca4b4d667 (diff) | |
runtime: remove gr::sys_pri
As it doesn't seem to be used anymore. This makes applying #1669 on
next||master unnecessary, and solves half of #1659 for 3.8
Closes #1667
Diffstat (limited to 'gnuradio-runtime')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/realtime_impl.h | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/sys_pri.h | 42 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/sys_pri.cc | 63 |
4 files changed, 0 insertions, 108 deletions
diff --git a/gnuradio-runtime/include/gnuradio/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/CMakeLists.txt index 230f8d6e6d..045f140e75 100644 --- a/gnuradio-runtime/include/gnuradio/CMakeLists.txt +++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt @@ -71,7 +71,6 @@ install(FILES sys_paths.h tag_checker.h types.h - sys_pri.h unittests.h rpccallbackregister_base.h rpcmanager_base.h diff --git a/gnuradio-runtime/include/gnuradio/realtime_impl.h b/gnuradio-runtime/include/gnuradio/realtime_impl.h index bc2250257b..7d8fbc85c2 100644 --- a/gnuradio-runtime/include/gnuradio/realtime_impl.h +++ b/gnuradio-runtime/include/gnuradio/realtime_impl.h @@ -28,8 +28,6 @@ /*! * \brief System independent way to ask for realtime scheduling - * - * \sa sys_pri.h */ namespace gr { diff --git a/gnuradio-runtime/include/gnuradio/sys_pri.h b/gnuradio-runtime/include/gnuradio/sys_pri.h deleted file mode 100644 index adceb91b9d..0000000000 --- a/gnuradio-runtime/include/gnuradio/sys_pri.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2008,2013 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_GNURADIO_SYS_PRI_H -#define INCLUDED_GNURADIO_SYS_PRI_H - -#include <gnuradio/api.h> -#include <realtime.h> - -/* - * A single place to define real-time priorities used by the system itself - */ -namespace gr { - - struct GR_RUNTIME_API sys_pri { - static rt_sched_param python(); // python code - static rt_sched_param normal(); // normal blocks - static rt_sched_param gcell_event_handler(); - static rt_sched_param usrp2_backend(); // thread that services the ethernet - }; - -} /* namespace gr */ - -#endif /* INCLUDED_GNURADIO_SYS_PRI_H */ diff --git a/gnuradio-runtime/lib/sys_pri.cc b/gnuradio-runtime/lib/sys_pri.cc deleted file mode 100644 index aa005ecd75..0000000000 --- a/gnuradio-runtime/lib/sys_pri.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2008 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <sys_pri.h> - -namespace gr { - - /* - * These may need per-OS tweaking. - * - * Under linux virtual_pri -> system_pri - * 0 -> 0 - * 1 -> 5 - * 2 -> 10 - * 3 -> 15 - * 4 -> 20 // typically used by jack and pulse audio - * 5 -> 25 - * 6 -> 30 - * 7 -> 35 - * 8 -> 40 - * 9 -> 45 - * 10 -> 50 - * 11 -> 54 - * 12 -> 59 - * 13 -> 64 - * 14 -> 69 - * 15 -> 74 - */ - rt_sched_param - sys_pri::python() { return rt_sched_param(0, RT_SCHED_RR); } - - rt_sched_param - sys_pri::normal() { return rt_sched_param(2, RT_SCHED_RR); } - - rt_sched_param - sys_pri::gcell_event_handler(){ return rt_sched_param(5, RT_SCHED_FIFO); } - - rt_sched_param - sys_pri::usrp2_backend() { return rt_sched_param(6, RT_SCHED_FIFO); } - -} /* namespace gr */ |