mirror of https://github.com/PentHertz/srsLTE.git
rename scheduler files. scheduler -> sched
This commit is contained in:
parent
4350e8ff70
commit
eae0dc93ad
|
@ -22,8 +22,8 @@
|
||||||
#ifndef SRSENB_MAC_H
|
#ifndef SRSENB_MAC_H
|
||||||
#define SRSENB_MAC_H
|
#define SRSENB_MAC_H
|
||||||
|
|
||||||
#include "scheduler.h"
|
#include "sched.h"
|
||||||
#include "scheduler_metric.h"
|
#include "sched_metric.h"
|
||||||
#include "srslte/common/log.h"
|
#include "srslte/common/log.h"
|
||||||
#include "srslte/common/mac_pcap.h"
|
#include "srslte/common/mac_pcap.h"
|
||||||
#include "srslte/common/task_scheduler.h"
|
#include "srslte/common/task_scheduler.h"
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#ifndef SRSENB_SCHEDULER_H
|
#ifndef SRSENB_SCHEDULER_H
|
||||||
#define SRSENB_SCHEDULER_H
|
#define SRSENB_SCHEDULER_H
|
||||||
|
|
||||||
#include "scheduler_grid.h"
|
#include "sched_grid.h"
|
||||||
#include "scheduler_harq.h"
|
#include "sched_harq.h"
|
||||||
#include "scheduler_ue.h"
|
#include "sched_ue.h"
|
||||||
#include "srslte/common/log.h"
|
#include "srslte/common/log.h"
|
||||||
#include "srslte/interfaces/enb_interfaces.h"
|
#include "srslte/interfaces/enb_interfaces.h"
|
||||||
#include "srslte/interfaces/sched_interface.h"
|
#include "srslte/interfaces/sched_interface.h"
|
|
@ -19,10 +19,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRSLTE_SCHEDULER_CARRIER_H
|
#ifndef SRSLTE_SCHED_CARRIER_H
|
||||||
#define SRSLTE_SCHEDULER_CARRIER_H
|
#define SRSLTE_SCHED_CARRIER_H
|
||||||
|
|
||||||
#include "scheduler.h"
|
#include "sched.h"
|
||||||
|
|
||||||
namespace srsenb {
|
namespace srsenb {
|
||||||
|
|
||||||
|
@ -134,4 +134,4 @@ private:
|
||||||
|
|
||||||
} // namespace srsenb
|
} // namespace srsenb
|
||||||
|
|
||||||
#endif // SRSLTE_SCHEDULER_CARRIER_H
|
#endif // SRSLTE_SCHED_CARRIER_H
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRSLTE_SCHEDULER_COMMON_H
|
#ifndef SRSLTE_SCHED_COMMON_H
|
||||||
#define SRSLTE_SCHEDULER_COMMON_H
|
#define SRSLTE_SCHED_COMMON_H
|
||||||
|
|
||||||
#include "srslte/adt/bounded_bitset.h"
|
#include "srslte/adt/bounded_bitset.h"
|
||||||
#include "srslte/common/tti_point.h"
|
#include "srslte/common/tti_point.h"
|
||||||
|
@ -149,4 +149,4 @@ void generate_cce_location(srslte_regs_t* regs,
|
||||||
|
|
||||||
} // namespace srsenb
|
} // namespace srsenb
|
||||||
|
|
||||||
#endif // SRSLTE_SCHEDULER_COMMON_H
|
#endif // SRSLTE_SCHED_COMMON_H
|
|
@ -19,11 +19,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRSLTE_SCHEDULER_GRID_H
|
#ifndef SRSLTE_SCHED_GRID_H
|
||||||
#define SRSLTE_SCHEDULER_GRID_H
|
#define SRSLTE_SCHED_GRID_H
|
||||||
|
|
||||||
#include "lib/include/srslte/interfaces/sched_interface.h"
|
#include "lib/include/srslte/interfaces/sched_interface.h"
|
||||||
#include "scheduler_ue.h"
|
#include "sched_ue.h"
|
||||||
#include "srslte/adt/bounded_bitset.h"
|
#include "srslte/adt/bounded_bitset.h"
|
||||||
#include "srslte/common/log.h"
|
#include "srslte/common/log.h"
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
@ -347,4 +347,4 @@ private:
|
||||||
|
|
||||||
} // namespace srsenb
|
} // namespace srsenb
|
||||||
|
|
||||||
#endif // SRSLTE_SCHEDULER_GRID_H
|
#endif // SRSLTE_SCHED_GRID_H
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef SRSENB_SCHEDULER_METRIC_H
|
#ifndef SRSENB_SCHEDULER_METRIC_H
|
||||||
#define SRSENB_SCHEDULER_METRIC_H
|
#define SRSENB_SCHEDULER_METRIC_H
|
||||||
|
|
||||||
#include "scheduler.h"
|
#include "sched.h"
|
||||||
|
|
||||||
namespace srsenb {
|
namespace srsenb {
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
#ifndef SRSENB_SCHEDULER_UE_H
|
#ifndef SRSENB_SCHEDULER_UE_H
|
||||||
#define SRSENB_SCHEDULER_UE_H
|
#define SRSENB_SCHEDULER_UE_H
|
||||||
|
|
||||||
#include "scheduler_common.h"
|
#include "sched_common.h"
|
||||||
#include "srslte/common/log.h"
|
#include "srslte/common/log.h"
|
||||||
#include "srslte/mac/pdu.h"
|
#include "srslte/mac/pdu.h"
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "scheduler_harq.h"
|
#include "sched_harq.h"
|
||||||
#include <bitset>
|
#include <bitset>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# and at http://www.gnu.org/licenses/.
|
# and at http://www.gnu.org/licenses/.
|
||||||
#
|
#
|
||||||
|
|
||||||
set(SOURCES mac.cc ue.cc scheduler.cc scheduler_carrier.cc scheduler_grid.cc scheduler_harq.cc scheduler_metric.cc scheduler_ue.cc)
|
set(SOURCES mac.cc ue.cc sched.cc sched_carrier.cc sched_grid.cc sched_harq.cc sched_metric.cc sched_ue.cc)
|
||||||
add_library(srsenb_mac STATIC ${SOURCES})
|
add_library(srsenb_mac STATIC ${SOURCES})
|
||||||
|
|
||||||
if(ENABLE_5GNR)
|
if(ENABLE_5GNR)
|
||||||
|
|
|
@ -19,11 +19,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <srsenb/hdr/stack/mac/scheduler_ue.h>
|
#include <srsenb/hdr/stack/mac/sched_ue.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_carrier.h"
|
#include "srsenb/hdr/stack/mac/sched_carrier.h"
|
||||||
#include "srslte/common/logmap.h"
|
#include "srslte/common/logmap.h"
|
||||||
#include "srslte/srslte.h"
|
#include "srslte/srslte.h"
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_carrier.h"
|
#include "srsenb/hdr/stack/mac/sched_carrier.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_metric.h"
|
#include "srsenb/hdr/stack/mac/sched_metric.h"
|
||||||
#include "srslte/common/log_helper.h"
|
#include "srslte/common/log_helper.h"
|
||||||
#include "srslte/common/logmap.h"
|
#include "srslte/common/logmap.h"
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_grid.h"
|
#include "srsenb/hdr/stack/mac/sched_grid.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srslte/common/log_helper.h"
|
#include "srslte/common/log_helper.h"
|
||||||
#include "srslte/common/logmap.h"
|
#include "srslte/common/logmap.h"
|
||||||
#include <srslte/interfaces/sched_interface.h>
|
#include <srslte/interfaces/sched_interface.h>
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srslte/common/log_helper.h"
|
#include "srslte/common/log_helper.h"
|
||||||
#include "srslte/mac/pdu.h"
|
#include "srslte/mac/pdu.h"
|
||||||
#include "srslte/srslte.h"
|
#include "srslte/srslte.h"
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_metric.h"
|
#include "srsenb/hdr/stack/mac/sched_metric.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_harq.h"
|
#include "srsenb/hdr/stack/mac/sched_harq.h"
|
||||||
#include "srslte/common/log_helper.h"
|
#include "srslte/common/log_helper.h"
|
||||||
#include "srslte/common/logmap.h"
|
#include "srslte/common/logmap.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
|
@ -21,8 +21,8 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_ue.h"
|
#include "srsenb/hdr/stack/mac/sched_ue.h"
|
||||||
#include "srslte/common/log_helper.h"
|
#include "srslte/common/log_helper.h"
|
||||||
#include "srslte/common/logmap.h"
|
#include "srslte/common/logmap.h"
|
||||||
#include "srslte/mac/pdu.h"
|
#include "srslte/mac/pdu.h"
|
|
@ -18,7 +18,7 @@
|
||||||
# and at http://www.gnu.org/licenses/.
|
# and at http://www.gnu.org/licenses/.
|
||||||
#
|
#
|
||||||
|
|
||||||
add_library(scheduler_test_common STATIC scheduler_test_common.cc sched_common_test_suite.cc sched_ue_ded_test_suite.cc
|
add_library(scheduler_test_common STATIC sched_test_common.cc sched_common_test_suite.cc sched_ue_ded_test_suite.cc
|
||||||
sched_sim_ue.cc sched_sim_ue.cc)
|
sched_sim_ue.cc sched_sim_ue.cc)
|
||||||
|
|
||||||
# Scheduler subcomponent testing
|
# Scheduler subcomponent testing
|
||||||
|
@ -33,7 +33,7 @@ target_link_libraries(sched_grid_test srsenb_mac
|
||||||
add_test(sched_grid_test sched_grid_test)
|
add_test(sched_grid_test sched_grid_test)
|
||||||
|
|
||||||
# Scheduler test random
|
# Scheduler test random
|
||||||
add_executable(scheduler_test_rand scheduler_test_rand.cc)
|
add_executable(scheduler_test_rand sched_test_rand.cc)
|
||||||
target_link_libraries(scheduler_test_rand srsenb_mac
|
target_link_libraries(scheduler_test_rand srsenb_mac
|
||||||
srsenb_phy
|
srsenb_phy
|
||||||
srslte_common
|
srslte_common
|
||||||
|
@ -46,7 +46,7 @@ target_link_libraries(scheduler_test_rand srsenb_mac
|
||||||
add_test(scheduler_test_rand scheduler_test_rand)
|
add_test(scheduler_test_rand scheduler_test_rand)
|
||||||
|
|
||||||
# Scheduler test random for CA
|
# Scheduler test random for CA
|
||||||
add_executable(scheduler_ca_test scheduler_ca_test.cc scheduler_test_common.cc)
|
add_executable(scheduler_ca_test sched_ca_test.cc sched_test_common.cc)
|
||||||
target_link_libraries(scheduler_ca_test srsenb_mac
|
target_link_libraries(scheduler_ca_test srsenb_mac
|
||||||
srsenb_phy
|
srsenb_phy
|
||||||
srslte_common
|
srslte_common
|
||||||
|
@ -58,5 +58,5 @@ target_link_libraries(scheduler_ca_test srsenb_mac
|
||||||
${Boost_LIBRARIES})
|
${Boost_LIBRARIES})
|
||||||
add_test(scheduler_ca_test scheduler_ca_test)
|
add_test(scheduler_ca_test scheduler_ca_test)
|
||||||
|
|
||||||
add_executable(sched_lc_ch_test sched_lc_ch_test.cc scheduler_test_common.cc)
|
add_executable(sched_lc_ch_test sched_lc_ch_test.cc sched_test_common.cc)
|
||||||
target_link_libraries(sched_lc_ch_test srsenb_mac srslte_common srslte_mac scheduler_test_common)
|
target_link_libraries(sched_lc_ch_test srsenb_mac srslte_common srslte_mac scheduler_test_common)
|
|
@ -19,9 +19,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "scheduler_test_common.h"
|
#include "sched_test_common.h"
|
||||||
#include "scheduler_test_utils.h"
|
#include "sched_test_utils.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srslte/mac/pdu.h"
|
#include "srslte/mac/pdu.h"
|
||||||
|
|
||||||
using namespace srsenb;
|
using namespace srsenb;
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef SRSLTE_SCHED_COMMON_TEST_SUITE_H
|
#ifndef SRSLTE_SCHED_COMMON_TEST_SUITE_H
|
||||||
#define SRSLTE_SCHED_COMMON_TEST_SUITE_H
|
#define SRSLTE_SCHED_COMMON_TEST_SUITE_H
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_common.h"
|
#include "srsenb/hdr/stack/mac/sched_common.h"
|
||||||
#include "srslte/adt/bounded_bitset.h"
|
#include "srslte/adt/bounded_bitset.h"
|
||||||
#include "srslte/common/tti_point.h"
|
#include "srslte/common/tti_point.h"
|
||||||
#include "srslte/interfaces/sched_interface.h"
|
#include "srslte/interfaces/sched_interface.h"
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "scheduler_test_common.h"
|
#include "sched_test_common.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_grid.h"
|
#include "srsenb/hdr/stack/mac/sched_grid.h"
|
||||||
#include "srslte/common/test_common.h"
|
#include "srslte/common/test_common.h"
|
||||||
|
|
||||||
using namespace srsenb;
|
using namespace srsenb;
|
||||||
|
|
|
@ -19,9 +19,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "scheduler_test_common.h"
|
#include "sched_test_common.h"
|
||||||
#include "scheduler_test_utils.h"
|
#include "sched_test_utils.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_ue.h"
|
#include "srsenb/hdr/stack/mac/sched_ue.h"
|
||||||
#include "srslte/common/test_common.h"
|
#include "srslte/common/test_common.h"
|
||||||
|
|
||||||
using namespace srsenb;
|
using namespace srsenb;
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "scheduler_test_common.h"
|
#include "sched_test_common.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srsenb/hdr/stack/upper/common_enb.h"
|
#include "srsenb/hdr/stack/upper/common_enb.h"
|
||||||
#include "srslte/mac/pdu.h"
|
#include "srslte/mac/pdu.h"
|
||||||
|
|
|
@ -19,12 +19,12 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRSLTE_SCHEDULER_TEST_COMMON_H
|
#ifndef SRSLTE_SCHED_TEST_COMMON_H
|
||||||
#define SRSLTE_SCHEDULER_TEST_COMMON_H
|
#define SRSLTE_SCHED_TEST_COMMON_H
|
||||||
|
|
||||||
#include "sched_sim_ue.h"
|
#include "sched_sim_ue.h"
|
||||||
#include "scheduler_test_utils.h"
|
#include "sched_test_utils.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include <random>
|
#include <random>
|
||||||
|
|
||||||
namespace srsenb {
|
namespace srsenb {
|
||||||
|
@ -200,4 +200,4 @@ protected:
|
||||||
|
|
||||||
} // namespace srsenb
|
} // namespace srsenb
|
||||||
|
|
||||||
#endif // SRSLTE_SCHEDULER_TEST_COMMON_H
|
#endif // SRSLTE_SCHED_TEST_COMMON_H
|
|
@ -19,9 +19,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_carrier.h"
|
#include "srsenb/hdr/stack/mac/sched_carrier.h"
|
||||||
#include "srsenb/hdr/stack/mac/scheduler_ue.h"
|
#include "srsenb/hdr/stack/mac/sched_ue.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <random>
|
#include <random>
|
||||||
|
@ -39,8 +39,8 @@
|
||||||
|
|
||||||
#include "sched_common_test_suite.h"
|
#include "sched_common_test_suite.h"
|
||||||
#include "sched_sim_ue.h"
|
#include "sched_sim_ue.h"
|
||||||
#include "scheduler_test_common.h"
|
#include "sched_test_common.h"
|
||||||
#include "scheduler_test_utils.h"
|
#include "sched_test_utils.h"
|
||||||
#include "srslte/common/test_common.h"
|
#include "srslte/common/test_common.h"
|
||||||
|
|
||||||
using srslte::tti_point;
|
using srslte::tti_point;
|
|
@ -19,10 +19,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRSLTE_SCHEDULER_TEST_UTILS_H
|
#ifndef SRSLTE_SCHED_TEST_UTILS_H
|
||||||
#define SRSLTE_SCHEDULER_TEST_UTILS_H
|
#define SRSLTE_SCHED_TEST_UTILS_H
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/mac/scheduler.h"
|
#include "srsenb/hdr/stack/mac/sched.h"
|
||||||
#include "srsenb/hdr/stack/upper/common_enb.h"
|
#include "srsenb/hdr/stack/upper/common_enb.h"
|
||||||
#include "srslte/common/test_common.h"
|
#include "srslte/common/test_common.h"
|
||||||
#include "srslte/interfaces/sched_interface.h"
|
#include "srslte/interfaces/sched_interface.h"
|
||||||
|
@ -304,4 +304,4 @@ private:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SRSLTE_SCHEDULER_TEST_UTILS_H
|
#endif // SRSLTE_SCHED_TEST_UTILS_H
|
Loading…
Reference in New Issue