F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lte: Move common typedefs in scheduler classes to parent class

Browse Source
This commit is contained in:
Eduardo Almeida
2023-04-30 19:15:40 +00:00
parent d316031258
commit 72c2619897
12 changed files with 23 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lte/model/cqa-ff-mac-scheduler.h
View File

@@ -45,21 +45,6 @@
namespace ns3
{
/// DL HARQ process status vector typedef
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
/// DL HARQ process timer vector typedef
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
/// DL HARQ process DCI buffer vector typedef
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
/// vector of the LCs and layers per UE
typedef std::vector<std::vector<RlcPduListElement_s>> RlcPduList_t;
/// vector of the 8 HARQ processes per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t;
/// UL HARQ process DCI buffer vector
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
/// UL HARQ process status vector
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/// CGA Flow Performance structure
struct CqasFlowPerf_t
{

10
src/lte/model/fdbet-ff-mac-scheduler.h
View File

@@ -42,16 +42,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/// fdbetsFlowPerf_t structure
struct fdbetsFlowPerf_t
{

11
src/lte/model/fdmt-ff-mac-scheduler.h
View File

@@ -47,17 +47,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; ///< vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t>
DlHarqRlcPduListBuffer_t; ///< vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* \ingroup ff-api
* \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Maximize Throughput

11
src/lte/model/fdtbfq-ff-mac-scheduler.h
View File

@@ -46,17 +46,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; ///< vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t>
DlHarqRlcPduListBuffer_t; ///< vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* Flow information
*/

23
src/lte/model/ff-mac-scheduler.h
View File

@@ -21,6 +21,8 @@
#ifndef FF_MAC_SCHEDULER_H
#define FF_MAC_SCHEDULER_H
#include "ff-mac-common.h"
#include <ns3/object.h>
namespace ns3
@@ -38,6 +40,27 @@ class LteFfrSapUser;
* \defgroup ff-api FF MAC Schedulers
*/
/// DL HARQ process status vector
using DlHarqProcessesStatus_t = std::vector<uint8_t>;
/// DL HARQ process timer vector
using DlHarqProcessesTimer_t = std::vector<uint8_t>;
/// DL HARQ process DCI buffer vector
using DlHarqProcessesDciBuffer_t = std::vector<DlDciListElement_s>;
/// Vector of the LCs and layers per UE
using RlcPduList_t = std::vector<std::vector<RlcPduListElement_s>>;
/// Vector of the 8 HARQ processes per UE
using DlHarqRlcPduListBuffer_t = std::vector<RlcPduList_t>;
/// UL HARQ process DCI buffer vector
using UlHarqProcessesDciBuffer_t = std::vector<UlDciListElement_s>;
/// UL HARQ process status vector
using UlHarqProcessesStatus_t = std::vector<uint8_t>;
/**
* \ingroup ff-api
*

10
src/lte/model/pf-ff-mac-scheduler.h
View File

@@ -41,16 +41,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/// pfsFlowPerf_t structure
struct pfsFlowPerf_t
{

10
src/lte/model/pss-ff-mac-scheduler.h
View File

@@ -42,16 +42,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* Flow information
*/

10
src/lte/model/rr-ff-mac-scheduler.h
View File

@@ -37,16 +37,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* \ingroup ff-api
* \brief Implements the SCHED SAP and CSCHED SAP for a Round Robin scheduler

10
src/lte/model/tdbet-ff-mac-scheduler.h
View File

@@ -42,16 +42,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/// tdbetsFlowPerf_t structure
struct tdbetsFlowPerf_t
{

10
src/lte/model/tdmt-ff-mac-scheduler.h
View File

@@ -43,16 +43,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* \ingroup ff-api
* \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Maximize Throughput scheduler

10
src/lte/model/tdtbfq-ff-mac-scheduler.h
View File

@@ -42,16 +42,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* Flow information
*/

10
src/lte/model/tta-ff-mac-scheduler.h
View File

@@ -43,16 +43,6 @@
namespace ns3
{
typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
typedef std::vector<std::vector<RlcPduListElement_s>>
RlcPduList_t; // vector of the LCs and layers per UE
typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
/**
* \ingroup ff-api
* \brief Implements the SCHED SAP and CSCHED SAP for a Throughput to Average scheduler