author | Marco Miozzo <marco.miozzo@cttc.es> |
Wed, 21 Dec 2011 12:18:23 +0100 | |
changeset 8523 | 0c515ddca47b |
parent 8516 | db748e56aea2 |
child 8538 | fbd322b7d863 |
permissions | -rw-r--r-- |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
2 |
/* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
3 |
* Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
4 |
* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
8 |
* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
12 |
* GNU General Public License for more details. |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
13 |
* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
17 |
* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
18 |
* Author: Marco Miozzo <marco.miozzo@cttc.es> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
19 |
*/ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
20 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
21 |
#include <ns3/log.h> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
22 |
#include <ns3/pointer.h> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
23 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
24 |
#include <ns3/simulator.h> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
25 |
#include <ns3/lte-amc.h> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
26 |
#include <ns3/pf-ff-mac-scheduler.h> |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
27 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
28 |
NS_LOG_COMPONENT_DEFINE ("PfFfMacScheduler"); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
29 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
30 |
namespace ns3 { |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
31 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
32 |
int PfType0AllocationRbg[4] = { |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
33 |
10, // RGB size 1 |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
34 |
26, // RGB size 2 |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
35 |
63, // RGB size 3 |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
36 |
110 // RGB size 4 |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
37 |
}; // see table 7.1.6.1-1 of 36.213 |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
38 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
39 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
40 |
NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
41 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
42 |
|
7936
2c531eab14f1
Move inline code in pf-ff-mac-schedluer to cc file
mmiozzo
parents:
7912
diff
changeset
|
43 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
44 |
class PfSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
45 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
46 |
public: |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
47 |
PfSchedulerMemberCschedSapProvider (PfFfMacScheduler* scheduler); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
48 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
49 |
// inherited from FfMacCschedSapProvider |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
50 |
virtual void CschedCellConfigReq (const struct CschedCellConfigReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
51 |
virtual void CschedUeConfigReq (const struct CschedUeConfigReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
52 |
virtual void CschedLcConfigReq (const struct CschedLcConfigReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
53 |
virtual void CschedLcReleaseReq (const struct CschedLcReleaseReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
54 |
virtual void CschedUeReleaseReq (const struct CschedUeReleaseReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
55 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
56 |
private: |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
57 |
PfSchedulerMemberCschedSapProvider (); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
58 |
PfFfMacScheduler* m_scheduler; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
59 |
}; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
60 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
61 |
PfSchedulerMemberCschedSapProvider::PfSchedulerMemberCschedSapProvider () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
62 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
63 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
64 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
65 |
PfSchedulerMemberCschedSapProvider::PfSchedulerMemberCschedSapProvider (PfFfMacScheduler* scheduler) : m_scheduler (scheduler) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
66 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
67 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
68 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
69 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
70 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
71 |
PfSchedulerMemberCschedSapProvider::CschedCellConfigReq (const struct CschedCellConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
72 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
73 |
m_scheduler->DoCschedCellConfigReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
74 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
75 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
76 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
77 |
PfSchedulerMemberCschedSapProvider::CschedUeConfigReq (const struct CschedUeConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
78 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
79 |
m_scheduler->DoCschedUeConfigReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
80 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
81 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
82 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
83 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
84 |
PfSchedulerMemberCschedSapProvider::CschedLcConfigReq (const struct CschedLcConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
85 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
86 |
m_scheduler->DoCschedLcConfigReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
87 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
88 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
89 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
90 |
PfSchedulerMemberCschedSapProvider::CschedLcReleaseReq (const struct CschedLcReleaseReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
91 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
92 |
m_scheduler->DoCschedLcReleaseReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
93 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
94 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
95 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
96 |
PfSchedulerMemberCschedSapProvider::CschedUeReleaseReq (const struct CschedUeReleaseReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
97 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
98 |
m_scheduler->DoCschedUeReleaseReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
99 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
100 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
101 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
102 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
103 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
104 |
class PfSchedulerMemberSchedSapProvider : public FfMacSchedSapProvider |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
105 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
106 |
public: |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
107 |
PfSchedulerMemberSchedSapProvider (PfFfMacScheduler* scheduler); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
108 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
109 |
// inherited from FfMacSchedSapProvider |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
110 |
virtual void SchedDlRlcBufferReq (const struct SchedDlRlcBufferReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
111 |
virtual void SchedDlPagingBufferReq (const struct SchedDlPagingBufferReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
112 |
virtual void SchedDlMacBufferReq (const struct SchedDlMacBufferReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
113 |
virtual void SchedDlTriggerReq (const struct SchedDlTriggerReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
114 |
virtual void SchedDlRachInfoReq (const struct SchedDlRachInfoReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
115 |
virtual void SchedDlCqiInfoReq (const struct SchedDlCqiInfoReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
116 |
virtual void SchedUlTriggerReq (const struct SchedUlTriggerReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
117 |
virtual void SchedUlNoiseInterferenceReq (const struct SchedUlNoiseInterferenceReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
118 |
virtual void SchedUlSrInfoReq (const struct SchedUlSrInfoReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
119 |
virtual void SchedUlMacCtrlInfoReq (const struct SchedUlMacCtrlInfoReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
120 |
virtual void SchedUlCqiInfoReq (const struct SchedUlCqiInfoReqParameters& params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
121 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
122 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
123 |
private: |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
124 |
PfSchedulerMemberSchedSapProvider (); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
125 |
PfFfMacScheduler* m_scheduler; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
126 |
}; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
127 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
128 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
129 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
130 |
PfSchedulerMemberSchedSapProvider::PfSchedulerMemberSchedSapProvider () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
131 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
132 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
133 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
134 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
135 |
PfSchedulerMemberSchedSapProvider::PfSchedulerMemberSchedSapProvider (PfFfMacScheduler* scheduler) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
136 |
: m_scheduler (scheduler) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
137 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
138 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
139 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
140 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
141 |
PfSchedulerMemberSchedSapProvider::SchedDlRlcBufferReq (const struct SchedDlRlcBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
142 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
143 |
m_scheduler->DoSchedDlRlcBufferReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
144 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
145 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
146 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
147 |
PfSchedulerMemberSchedSapProvider::SchedDlPagingBufferReq (const struct SchedDlPagingBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
148 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
149 |
m_scheduler->DoSchedDlPagingBufferReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
150 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
151 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
152 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
153 |
PfSchedulerMemberSchedSapProvider::SchedDlMacBufferReq (const struct SchedDlMacBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
154 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
155 |
m_scheduler->DoSchedDlMacBufferReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
156 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
157 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
158 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
159 |
PfSchedulerMemberSchedSapProvider::SchedDlTriggerReq (const struct SchedDlTriggerReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
160 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
161 |
m_scheduler->DoSchedDlTriggerReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
162 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
163 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
164 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
165 |
PfSchedulerMemberSchedSapProvider::SchedDlRachInfoReq (const struct SchedDlRachInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
166 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
167 |
m_scheduler->DoSchedDlRachInfoReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
168 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
169 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
170 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
171 |
PfSchedulerMemberSchedSapProvider::SchedDlCqiInfoReq (const struct SchedDlCqiInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
172 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
173 |
m_scheduler->DoSchedDlCqiInfoReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
174 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
175 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
176 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
177 |
PfSchedulerMemberSchedSapProvider::SchedUlTriggerReq (const struct SchedUlTriggerReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
178 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
179 |
m_scheduler->DoSchedUlTriggerReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
180 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
181 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
182 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
183 |
PfSchedulerMemberSchedSapProvider::SchedUlNoiseInterferenceReq (const struct SchedUlNoiseInterferenceReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
184 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
185 |
m_scheduler->DoSchedUlNoiseInterferenceReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
186 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
187 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
188 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
189 |
PfSchedulerMemberSchedSapProvider::SchedUlSrInfoReq (const struct SchedUlSrInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
190 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
191 |
m_scheduler->DoSchedUlSrInfoReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
192 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
193 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
194 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
195 |
PfSchedulerMemberSchedSapProvider::SchedUlMacCtrlInfoReq (const struct SchedUlMacCtrlInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
196 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
197 |
m_scheduler->DoSchedUlMacCtrlInfoReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
198 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
199 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
200 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
201 |
PfSchedulerMemberSchedSapProvider::SchedUlCqiInfoReq (const struct SchedUlCqiInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
202 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
203 |
m_scheduler->DoSchedUlCqiInfoReq (params); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
204 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
205 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
206 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
207 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
208 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
209 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
210 |
PfFfMacScheduler::PfFfMacScheduler () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
211 |
: m_cschedSapUser (0), |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
212 |
m_schedSapUser (0), |
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
213 |
m_timeWindow (99.0), |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
214 |
m_schedTtiDelay (2), |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
215 |
// WILD ACK: based on a m_macChTtiDelay = 1 |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
216 |
m_nextRntiUl (0) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
217 |
{ |
8523
0c515ddca47b
Change LteAmc* to Ptr<LteAmc> in PF scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8516
diff
changeset
|
218 |
m_amc = CreateObject <LteAmc> (); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
219 |
m_cschedSapProvider = new PfSchedulerMemberCschedSapProvider (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
220 |
m_schedSapProvider = new PfSchedulerMemberSchedSapProvider (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
221 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
222 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
223 |
PfFfMacScheduler::~PfFfMacScheduler () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
224 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
225 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
226 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
227 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
228 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
229 |
PfFfMacScheduler::DoDispose () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
230 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
231 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
232 |
delete m_cschedSapProvider; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
233 |
delete m_schedSapProvider; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
234 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
235 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
236 |
TypeId |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
237 |
PfFfMacScheduler::GetTypeId (void) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
238 |
{ |
7983
b91d5a39aabc
scheduler and propagation model configurable through ConfigStore
Nicola Baldo <nbaldo@cttc.es>
parents:
7979
diff
changeset
|
239 |
static TypeId tid = TypeId ("ns3::PfFfMacScheduler") |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
240 |
.SetParent<FfMacScheduler> () |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
241 |
.AddConstructor<PfFfMacScheduler> () |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
242 |
.AddAttribute ("CqiTimerThreshold", |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
243 |
"The number of TTIs a CQI is valid (default 1000 - 1 sec.)", |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
244 |
UintegerValue (1000), |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
245 |
MakeUintegerAccessor (&PfFfMacScheduler::m_cqiTimersThreshold), |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
246 |
MakeUintegerChecker<uint32_t> ()) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
247 |
; |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
248 |
return tid; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
249 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
250 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
251 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
252 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
253 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
254 |
PfFfMacScheduler::SetFfMacCschedSapUser (FfMacCschedSapUser* s) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
255 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
256 |
m_cschedSapUser = s; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
257 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
258 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
259 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
260 |
PfFfMacScheduler::SetFfMacSchedSapUser (FfMacSchedSapUser* s) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
261 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
262 |
m_schedSapUser = s; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
263 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
264 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
265 |
FfMacCschedSapProvider* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
266 |
PfFfMacScheduler::GetFfMacCschedSapProvider () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
267 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
268 |
return m_cschedSapProvider; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
269 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
270 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
271 |
FfMacSchedSapProvider* |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
272 |
PfFfMacScheduler::GetFfMacSchedSapProvider () |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
273 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
274 |
return m_schedSapProvider; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
275 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
276 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
277 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
278 |
PfFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::CschedCellConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
279 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
280 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
281 |
// Read the subset of parameters used |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
282 |
m_cschedCellConfig = params; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
283 |
FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
284 |
cnf.m_result = SUCCESS; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
285 |
m_cschedSapUser->CschedUeConfigCnf (cnf); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
286 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
287 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
288 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
289 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
290 |
PfFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::CschedUeConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
291 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
292 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
293 |
// Not used at this stage |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
294 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
295 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
296 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
297 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
298 |
PfFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::CschedLcConfigReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
299 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
300 |
NS_LOG_FUNCTION (this << " New LC, rnti: " << params.m_rnti); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
301 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
302 |
std::map <uint16_t, pfsFlowPerf_t>::iterator it; |
7909
82b1281ea0a3
Updates for MACOS compilation (virtual destructors and variable types)
mmiozzo
parents:
7899
diff
changeset
|
303 |
for (uint16_t i = 0; i < params.m_logicalChannelConfigList.size (); i++) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
304 |
{ |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
305 |
it = m_flowStatsDl.find (params.m_rnti); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
306 |
|
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
307 |
if (it == m_flowStatsDl.end ()) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
308 |
{ |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
309 |
pfsFlowPerf_t flowStatsDl; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
310 |
flowStatsDl.flowStart = Simulator::Now (); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
311 |
flowStatsDl.totalBytesTransmitted = 0; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
312 |
flowStatsDl.lastTtiBytesTrasmitted = 0; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
313 |
flowStatsDl.lastAveragedThroughput = 1; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
314 |
m_flowStatsDl.insert (std::pair<uint16_t, pfsFlowPerf_t> (params.m_rnti, flowStatsDl)); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
315 |
pfsFlowPerf_t flowStatsUl; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
316 |
flowStatsUl.flowStart = Simulator::Now (); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
317 |
flowStatsUl.totalBytesTransmitted = 0; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
318 |
flowStatsUl.lastTtiBytesTrasmitted = 0; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
319 |
flowStatsUl.lastAveragedThroughput = 1; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
320 |
m_flowStatsUl.insert (std::pair<uint16_t, pfsFlowPerf_t> (params.m_rnti, flowStatsUl)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
321 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
322 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
323 |
{ |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
324 |
NS_LOG_ERROR ("RNTI already exists"); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
325 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
326 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
327 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
328 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
329 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
330 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
331 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
332 |
PfFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::CschedLcReleaseReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
333 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
334 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
335 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
336 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
337 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
338 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
339 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
340 |
PfFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::CschedUeReleaseReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
341 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
342 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
343 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
344 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
345 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
346 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
347 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
348 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
349 |
PfFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::SchedDlRlcBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
350 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
351 |
NS_LOG_FUNCTION (this << params.m_rnti << (uint32_t) params.m_logicalChannelIdentity); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
352 |
// API generated by RLC for updating RLC parameters on a LC (tx and retx queues) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
353 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
354 |
std::map <LteFlowId_t, FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator it; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
355 |
|
7971 | 356 |
LteFlowId_t flow (params.m_rnti, params.m_logicalChannelIdentity); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
357 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
358 |
it = m_rlcBufferReq.find (flow); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
359 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
360 |
if (it == m_rlcBufferReq.end ()) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
361 |
{ |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
362 |
m_rlcBufferReq.insert (std::pair <LteFlowId_t, FfMacSchedSapProvider::SchedDlRlcBufferReqParameters> (flow, params)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
363 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
364 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
365 |
{ |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
366 |
(*it).second = params; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
367 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
368 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
369 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
370 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
371 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
372 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
373 |
PfFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider::SchedDlPagingBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
374 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
375 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
376 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
377 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
378 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
379 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
380 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
381 |
PfFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::SchedDlMacBufferReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
382 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
383 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
384 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
385 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
386 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
387 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
388 |
int |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
389 |
PfFfMacScheduler::GetRbgSize (int dlbandwidth) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
390 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
391 |
for (int i = 0; i < 4; i++) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
392 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
393 |
if (dlbandwidth < PfType0AllocationRbg[i]) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
394 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
395 |
return (i + 1); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
396 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
397 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
398 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
399 |
return (-1); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
400 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
401 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
402 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
403 |
int |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
404 |
PfFfMacScheduler::LcActivePerFlow (uint16_t rnti) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
405 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
406 |
std::map <LteFlowId_t, FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator it; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
407 |
int lcActive = 0; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
408 |
for (it = m_rlcBufferReq.begin (); it != m_rlcBufferReq.end (); it++) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
409 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
410 |
if (((*it).first.m_rnti == rnti) && (((*it).second.m_rlcTransmissionQueueSize > 0) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
411 |
|| ((*it).second.m_rlcRetransmissionQueueSize > 0) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
412 |
|| ((*it).second.m_rlcStatusPduSize > 0) )) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
413 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
414 |
lcActive++; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
415 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
416 |
if ((*it).first.m_rnti > rnti) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
417 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
418 |
break; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
419 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
420 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
421 |
return (lcActive); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
422 |
|
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
423 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
424 |
|
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
425 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
426 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
427 |
PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::SchedDlTriggerReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
428 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
429 |
NS_LOG_FUNCTION (this << " Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
430 |
// API generated by RLC for triggering the scheduling of a DL subframe |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
431 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
432 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
433 |
// evaluate the relative channel quality indicator for each UE per each RBG |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
434 |
// (since we are using allocation type 0 the small unit of allocation is RBG) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
435 |
// Resource allocation type 0 (see sec 7.1.6.1 of 36.213) |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
436 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
437 |
RefreshDlCqiMaps (); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
438 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
439 |
int rbgSize = GetRbgSize (m_cschedCellConfig.m_dlBandwidth); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
440 |
int rbgNum = m_cschedCellConfig.m_dlBandwidth / rbgSize; |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
441 |
//std::vector <LteFlowId_t> rbgAllocationMap; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
442 |
std::map <uint16_t, std::vector <uint16_t> > allocationMap; |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
443 |
for (int i = 0; i < rbgNum; i++) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
444 |
{ |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
445 |
// NS_LOG_DEBUG (this << " ALLOCATION for RBG " << i << " of " << rbgNum); |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
446 |
std::map <uint16_t, pfsFlowPerf_t>::iterator it; |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
447 |
std::map <uint16_t, pfsFlowPerf_t>::iterator itMax = m_flowStatsDl.end (); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
448 |
double rcqiMax = 0.0; |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
449 |
for (it = m_flowStatsDl.begin (); it != m_flowStatsDl.end (); it++) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
450 |
{ |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
451 |
std::map <uint16_t,SbMeasResult_s>::iterator itCqi; |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
452 |
itCqi = m_a30CqiRxed.find ((*it).first); |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
453 |
uint8_t cqi = 0; |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
454 |
if (itCqi == m_a30CqiRxed.end ()) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
455 |
{ |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
456 |
// NS_LOG_DEBUG (this << " No DL-CQI for this UE " << (*it).first); |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
457 |
cqi = 1; // start with lowest value |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
458 |
} |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
459 |
else |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
460 |
{ |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
461 |
cqi = (*itCqi).second.m_higherLayerSelected.at (i).m_sbCqi.at (0); |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
462 |
// NS_LOG_INFO (this << " CQI " << (uint32_t)cqi); |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
463 |
} |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
464 |
if (cqi > 0) // CQI == 0 means "out of range" (see table 7.2.3-1 of 36.213) |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
465 |
{ |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
466 |
// NS_LOG_DEBUG (this << " LC active " << LcActivePerFlow ((*it).first)); |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
467 |
if (LcActivePerFlow ((*it).first) > 0) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
468 |
{ |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
469 |
// this UE has data to transmit |
8516
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
470 |
uint8_t mcs = m_amc->GetMcsFromCqi (cqi); |
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
471 |
double achievableRate = ((m_amc->GetTbSizeFromMcs (mcs, 1) / 8) / 0.001); // = TB size / TTI |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
472 |
double rcqi = achievableRate / (*it).second.lastAveragedThroughput; |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
473 |
// NS_LOG_DEBUG (this << " RNTI " << (*it).first << " MCS " << (uint32_t)mcs << " achievableRate " << achievableRate << " avgThr " << (*it).second.lastAveragedThroughput << " RCQI " << rcqi); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
474 |
|
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
475 |
if (rcqi > rcqiMax) |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
476 |
{ |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
477 |
rcqiMax = rcqi; |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
478 |
itMax = it; |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
479 |
} |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
480 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
481 |
} // end if cqi |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
482 |
} // end for m_rlcBufferReq |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
483 |
|
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
484 |
if (itMax == m_flowStatsDl.end ()) |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
485 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
486 |
// no UE available for this RB |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
487 |
NS_LOG_DEBUG (this << " no UE found"); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
488 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
489 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
490 |
{ |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
491 |
std::map <uint16_t, std::vector <uint16_t> >::iterator itMap; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
492 |
itMap = allocationMap.find ((*itMax).first); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
493 |
if (itMap == allocationMap.end ()) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
494 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
495 |
// insert new element |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
496 |
std::vector <uint16_t> tempMap; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
497 |
tempMap.push_back (i); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
498 |
allocationMap.insert (std::pair <uint16_t, std::vector <uint16_t> > ((*itMax).first, tempMap)); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
499 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
500 |
else |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
501 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
502 |
(*itMap).second.push_back (i); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
503 |
} |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
504 |
// NS_LOG_DEBUG (this << " UE assigned " << (*itMax).first); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
505 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
506 |
} // end for RBGs |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
507 |
|
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
508 |
// reset TTI stats of users |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
509 |
std::map <uint16_t, pfsFlowPerf_t>::iterator itStats; |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
510 |
for (itStats = m_flowStatsDl.begin (); itStats != m_flowStatsDl.end (); itStats++) |
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
511 |
{ |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
512 |
(*itStats).second.lastTtiBytesTrasmitted = 0; |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
513 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
514 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
515 |
// generate the transmission opportunities by grouping the RBGs of the same RNTI and |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
516 |
// creating the correspondent DCIs |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
517 |
FfMacSchedSapUser::SchedDlConfigIndParameters ret; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
518 |
std::map <uint16_t, std::vector <uint16_t> >::iterator itMap = allocationMap.begin (); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
519 |
while (itMap != allocationMap.end ()) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
520 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
521 |
// create new BuildDataListElement_s for this LC |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
522 |
BuildDataListElement_s newEl; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
523 |
newEl.m_rnti = (*itMap).first; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
524 |
// create the DlDciListElement_s |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
525 |
DlDciListElement_s newDci; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
526 |
std::vector <struct RlcPduListElement_s> newRlcPduLe; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
527 |
newDci.m_rnti = (*itMap).first; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
528 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
529 |
uint16_t lcActives = LcActivePerFlow ((*itMap).first); |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
530 |
// NS_LOG_DEBUG (this << "Allocate user " << newEl.m_rnti << " rbg " << lcActives); |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
531 |
uint16_t RgbPerRnti = (*itMap).second.size (); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
532 |
std::map <uint16_t,SbMeasResult_s>::iterator itCqi; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
533 |
itCqi = m_a30CqiRxed.find ((*itMap).first); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
534 |
uint8_t worstCqi = 15; |
8182
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
535 |
if (itCqi != m_a30CqiRxed.end ()) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
536 |
{ |
8182
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
537 |
for (uint16_t k = 0; k < (*itMap).second.size (); k++) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
538 |
{ |
8182
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
539 |
if ((*itCqi).second.m_higherLayerSelected.size () > (*itMap).second.at (k)) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
540 |
{ |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
541 |
// NS_LOG_DEBUG (this << " RBG " << (*itMap).second.at (k) << " CQI " << (uint16_t)((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) ); |
8182
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
542 |
if (((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) < worstCqi) |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
543 |
{ |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
544 |
worstCqi = ((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)); |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
545 |
} |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
546 |
} |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
547 |
else |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
548 |
{ |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
549 |
worstCqi = 1; // try with lowest MCS in RBG with no info on channel |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
550 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
551 |
} |
8182
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
552 |
} |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
553 |
else |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
554 |
{ |
81d05985d460
Bug-fix JIRA-152 m_a30CqiRxed lookup in PfFfMacScheduler::DoSchedDlTriggerReq
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8181
diff
changeset
|
555 |
worstCqi = 1; // try with lowest MCS in RBG with no info on channel |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
556 |
} |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
557 |
// NS_LOG_DEBUG (this << " CQI " << (uint16_t)worstCqi); |
8516
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
558 |
newDci.m_mcs.push_back (m_amc->GetMcsFromCqi (worstCqi)); |
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
559 |
int tbSize = (m_amc->GetTbSizeFromMcs (newDci.m_mcs.at (0), RgbPerRnti * rbgSize) / 8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
560 |
newDci.m_tbsSize.push_back (tbSize); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
561 |
|
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
562 |
newDci.m_resAlloc = 0; // only allocation type 0 at this stage |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
563 |
newDci.m_rbBitmap = 0; // TBD (32 bit bitmap see 7.1.6 of 36.213) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
564 |
uint32_t rbgMask = 0; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
565 |
for (uint16_t k = 0; k < (*itMap).second.size (); k++) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
566 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
567 |
rbgMask = rbgMask + (0x1 << (*itMap).second.at (k)); |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
568 |
// NS_LOG_DEBUG (this << " Allocated PRB " << (*itMap).second.at (k)); |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
569 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
570 |
newDci.m_rbBitmap = rbgMask; // (32 bit bitmap see 7.1.6 of 36.213) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
571 |
|
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
572 |
// create the rlc PDUs -> equally divide resources among actives LCs |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
573 |
int rlcPduSize = tbSize / lcActives; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
574 |
std::map <LteFlowId_t, FfMacSchedSapProvider::SchedDlRlcBufferReqParameters>::iterator itBufReq; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
575 |
for (itBufReq = m_rlcBufferReq.begin (); itBufReq != m_rlcBufferReq.end (); itBufReq++) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
576 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
577 |
if (((*itBufReq).first.m_rnti == (*itMap).first) && (((*itBufReq).second.m_rlcTransmissionQueueSize > 0) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
578 |
|| ((*itBufReq).second.m_rlcRetransmissionQueueSize > 0) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
579 |
|| ((*itBufReq).second.m_rlcStatusPduSize > 0) )) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
580 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
581 |
RlcPduListElement_s newRlcEl; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
582 |
newRlcEl.m_logicalChannelIdentity = (*itBufReq).first.m_lcId; |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
583 |
// NS_LOG_DEBUG (this << " LCID " << (uint32_t) newRlcEl.m_logicalChannelIdentity << " size " << rlcPduSize); |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
584 |
newRlcEl.m_size = rlcPduSize; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
585 |
newRlcPduLe.push_back (newRlcEl); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
586 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
587 |
if ((*itBufReq).first.m_rnti > (*itMap).first) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
588 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
589 |
break; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
590 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
591 |
} |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
592 |
newDci.m_ndi.push_back (1); // TBD (new data indicator) |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
593 |
newDci.m_rv.push_back (0); // TBD (redundancy version) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
594 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
595 |
newEl.m_dci = newDci; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
596 |
// ...more parameters -> ingored in this version |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
597 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
598 |
newEl.m_rlcPduList.push_back (newRlcPduLe); |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
599 |
ret.m_buildDataList.push_back (newEl); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
600 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
601 |
// update UE stats |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
602 |
std::map <uint16_t, pfsFlowPerf_t>::iterator it; |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
603 |
it = m_flowStatsDl.find ((*itMap).first); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
604 |
if (it != m_flowStatsDl.end ()) |
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
605 |
{ |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
606 |
(*it).second.lastTtiBytesTrasmitted = tbSize; |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
607 |
// NS_LOG_DEBUG (this << " UE bytes txed " << (*it).second.lastTtiBytesTrasmitted); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
608 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
609 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
610 |
} |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
611 |
else |
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
612 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
613 |
NS_LOG_DEBUG (this << " No Stats for this allocated UE"); |
8035
d2e70680881a
LenaTestPfFfMacSchedulerSuite works with distance 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7983
diff
changeset
|
614 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
615 |
|
7979
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
616 |
itMap++; |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
617 |
} // end while allocation |
8e542d91bfc3
LENA-68 PfFfMacScheduler updated to single TB per RNTI (LC multiplexed)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7974
diff
changeset
|
618 |
ret.m_nrOfPdcchOfdmSymbols = 1; // TODO: check correct value according the DCIs txed |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
619 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
620 |
|
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
621 |
// update UEs stats |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
622 |
for (itStats = m_flowStatsDl.begin (); itStats != m_flowStatsDl.end (); itStats++) |
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
623 |
{ |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
624 |
(*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
625 |
// update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term Evolution, Ed Wiley) |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
626 |
(*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
627 |
// NS_LOG_DEBUG (this << " UE tot bytes " << (*itStats).second.totalBytesTransmitted); |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
628 |
// NS_LOG_DEBUG (this << " UE avg thr " << (*itStats).second.lastAveragedThroughput); |
8047
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
629 |
(*itStats).second.lastTtiBytesTrasmitted = 0; |
3741b99462cd
Update PfFfMacScheduler::m_timWindow for having giving more memory to the scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8035
diff
changeset
|
630 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
631 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
632 |
m_schedSapUser->SchedDlConfigInd (ret); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
633 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
634 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
635 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
636 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
637 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
638 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
639 |
PfFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::SchedDlRachInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
640 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
641 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
642 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
643 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
644 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
645 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
646 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
647 |
PfFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::SchedDlCqiInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
648 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
649 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
650 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
651 |
for (unsigned int i = 0; i < params.m_cqiList.size (); i++) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
652 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
653 |
if ( params.m_cqiList.at (i).m_cqiType == CqiListElement_s::P10 ) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
654 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
655 |
// wideband CQI reporting |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
656 |
std::map <uint16_t,uint8_t>::iterator it; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
657 |
uint16_t rnti = params.m_cqiList.at (i).m_rnti; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
658 |
it = m_p10CqiRxed.find (rnti); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
659 |
if (it == m_p10CqiRxed.end ()) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
660 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
661 |
// create the new entry |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
662 |
m_p10CqiRxed.insert ( std::pair<uint16_t, uint8_t > (rnti, params.m_cqiList.at (i).m_wbCqi.at (0)) ); // only codeword 0 at this stage (SISO) |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
663 |
// generate correspondent timer |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
664 |
m_p10CqiTimers.insert ( std::pair<uint16_t, uint32_t > (rnti, m_cqiTimersThreshold)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
665 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
666 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
667 |
{ |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
668 |
// update the CQI value and refresh correspondent timer |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
669 |
(*it).second = params.m_cqiList.at (i).m_wbCqi.at (0); |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
670 |
// update correspondent timer |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
671 |
std::map <uint16_t,uint32_t>::iterator itTimers; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
672 |
itTimers = m_p10CqiTimers.find (rnti); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
673 |
(*itTimers).second = m_cqiTimersThreshold; |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
674 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
675 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
676 |
else if ( params.m_cqiList.at (i).m_cqiType == CqiListElement_s::A30 ) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
677 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
678 |
// subband CQI reporting high layer configured |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
679 |
std::map <uint16_t,SbMeasResult_s>::iterator it; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
680 |
uint16_t rnti = params.m_cqiList.at (i).m_rnti; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
681 |
it = m_a30CqiRxed.find (rnti); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
682 |
if (it == m_a30CqiRxed.end ()) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
683 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
684 |
// create the new entry |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
685 |
m_a30CqiRxed.insert ( std::pair<uint16_t, SbMeasResult_s > (rnti, params.m_cqiList.at (i).m_sbMeasResult) ); |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
686 |
m_a30CqiTimers.insert ( std::pair<uint16_t, uint32_t > (rnti, m_cqiTimersThreshold)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
687 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
688 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
689 |
{ |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
690 |
// update the CQI value and refresh correspondent timer |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
691 |
(*it).second = params.m_cqiList.at (i).m_sbMeasResult; |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
692 |
std::map <uint16_t,uint32_t>::iterator itTimers; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
693 |
itTimers = m_a30CqiTimers.find (rnti); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
694 |
(*itTimers).second = m_cqiTimersThreshold; |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
695 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
696 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
697 |
else |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
698 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
699 |
NS_LOG_ERROR (this << " CQI type unknown"); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
700 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
701 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
702 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
703 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
704 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
705 |
|
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
706 |
|
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
707 |
double |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
708 |
PfFfMacScheduler::EstimateUlSinr (uint16_t rnti, uint16_t rb) |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
709 |
{ |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
710 |
std::map <uint16_t, std::vector <double> >::iterator itCqi = m_ueCqi.find (rnti); |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
711 |
if (itCqi == m_ueCqi.end ()) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
712 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
713 |
// no cqi info about this UE |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
714 |
return (NO_SINR); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
715 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
716 |
} |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
717 |
else |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
718 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
719 |
// take the average SINR value among the available |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
720 |
double sinrSum = 0; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
721 |
int sinrNum = 0; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
722 |
for (uint32_t i = 0; i < m_cschedCellConfig.m_ulBandwidth; i++) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
723 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
724 |
double sinr = (*itCqi).second.at (i); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
725 |
if (sinr != NO_SINR) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
726 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
727 |
sinrSum += sinr; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
728 |
sinrNum++; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
729 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
730 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
731 |
double estimatedSinr = sinrSum / (double)sinrNum; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
732 |
// store the value |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
733 |
(*itCqi).second.at (rb) = estimatedSinr; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
734 |
return (estimatedSinr); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
735 |
} |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
736 |
} |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
737 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
738 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
739 |
PfFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::SchedUlTriggerReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
740 |
{ |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
741 |
// NS_LOG_FUNCTION (this << " Frame no. " << (params.m_sfnSf >> 4) << " subframe no. " << (0xF & params.m_sfnSf)); |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
742 |
|
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
743 |
RefreshUlCqiMaps (); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
744 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
745 |
std::map <uint16_t,uint8_t>::iterator it; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
746 |
int nflows = 0; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
747 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
748 |
for (it = m_ceBsrRxed.begin (); it != m_ceBsrRxed.end (); it++) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
749 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
750 |
// remove old entries of this UE-LC |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
751 |
if ((*it).second > 0) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
752 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
753 |
nflows++; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
754 |
} |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
755 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
756 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
757 |
if (nflows == 0) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
758 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
759 |
return ; // no flows to be scheduled |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
760 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
761 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
762 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
763 |
// Divide the resource equally among the active users |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
764 |
int rbPerFlow = m_cschedCellConfig.m_ulBandwidth / nflows; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
765 |
if (rbPerFlow == 0) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
766 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
767 |
rbPerFlow = 1; // at least 1 rbg per flow (till available resource) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
768 |
} |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
769 |
int rbAllocated = 0; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
770 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
771 |
FfMacSchedSapUser::SchedUlConfigIndParameters ret; |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
772 |
std::vector <uint16_t> rbgAllocationMap; |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
773 |
std::map <uint16_t, pfsFlowPerf_t>::iterator itStats; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
774 |
if (m_nextRntiUl != 0) |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
775 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
776 |
for (it = m_ceBsrRxed.begin (); it != m_ceBsrRxed.end (); it++) |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
777 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
778 |
if ((*it).first == m_nextRntiUl) |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
779 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
780 |
break; |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
781 |
} |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
782 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
783 |
if (it == m_ceBsrRxed.end ()) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
784 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
785 |
NS_LOG_ERROR (this << " no user found"); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
786 |
} |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
787 |
} |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
788 |
else |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
789 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
790 |
it = m_ceBsrRxed.begin (); |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
791 |
m_nextRntiUl = (*it).first; |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
792 |
} |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
793 |
do |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
794 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
795 |
if (rbAllocated + rbPerFlow > m_cschedCellConfig.m_ulBandwidth) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
796 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
797 |
// limit to physical resources last resource assignment |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
798 |
rbPerFlow = m_cschedCellConfig.m_ulBandwidth - rbAllocated; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
799 |
} |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
800 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
801 |
UlDciListElement_s uldci; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
802 |
uldci.m_rnti = (*it).first; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
803 |
uldci.m_rbStart = rbAllocated; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
804 |
uldci.m_rbLen = rbPerFlow; |
7947 | 805 |
std::map <uint16_t, std::vector <double> >::iterator itCqi = m_ueCqi.find ((*it).first); |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
806 |
int cqi = 0; |
7947 | 807 |
if (itCqi == m_ueCqi.end ()) |
808 |
{ |
|
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
809 |
// no cqi info about this UE |
7947 | 810 |
uldci.m_mcs = 0; // MCS 0 -> UL-AMC TBD |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
811 |
// NS_LOG_DEBUG (this << " UE does not have ULCQI " << (*it).first ); |
7947 | 812 |
} |
813 |
else |
|
814 |
{ |
|
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
815 |
// take the lowest CQI value (worst RB) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
816 |
double minSinr = (*itCqi).second.at (uldci.m_rbStart); |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
817 |
if (minSinr == NO_SINR) |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
818 |
{ |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
819 |
minSinr = EstimateUlSinr ((*it).first, uldci.m_rbStart); |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
820 |
} |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
821 |
for (uint16_t i = uldci.m_rbStart; i < uldci.m_rbStart + uldci.m_rbLen; i++) |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
822 |
{ |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
823 |
// NS_LOG_DEBUG (this << " UE " << (*it).first << " has SINR " << (*itCqi).second.at(i)); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
824 |
double sinr = (*itCqi).second.at (i); |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
825 |
if (sinr == NO_SINR) |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
826 |
{ |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
827 |
sinr = EstimateUlSinr ((*it).first, i); |
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
828 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
829 |
if ((*itCqi).second.at (i) < minSinr) |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
830 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
831 |
minSinr = (*itCqi).second.at (i); |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
832 |
} |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
833 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
834 |
|
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
835 |
// translate SINR -> cqi: WILD ACK: same as DL |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
836 |
double s = log2 ( 1 + ( |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
837 |
pow (10, minSinr / 10 ) / |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
838 |
( (-log (5.0 * 0.00005 )) / 1.5) )); |
8516
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
839 |
cqi = m_amc->GetCqiFromSpectralEfficiency (s); |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
840 |
if (cqi == 0) |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
841 |
{ |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
842 |
it++; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
843 |
if (it == m_ceBsrRxed.end ()) |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
844 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
845 |
// restart from the first |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
846 |
it = m_ceBsrRxed.begin (); |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
847 |
} |
7966
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
848 |
continue; // CQI == 0 means "out of range" (see table 7.2.3-1 of 36.213) |
c2cfb1a64d66
LENA-72 CQI=0 behaviour
Marco Miozzo <marco.miozzo@cttc.es>
parents:
7959
diff
changeset
|
849 |
} |
8516
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
850 |
uldci.m_mcs = m_amc->GetMcsFromCqi (cqi); |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
851 |
// NS_LOG_DEBUG (this << " UE " << (*it).first << " minsinr " << minSinr << " -> mcs " << (uint16_t)uldci.m_mcs); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
852 |
|
7947 | 853 |
} |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
854 |
|
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
855 |
rbAllocated += rbPerFlow; |
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
856 |
// store info on allocation for managing ul-cqi interpretation |
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
857 |
for (int i = 0; i < rbPerFlow; i++) |
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
858 |
{ |
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
859 |
rbgAllocationMap.push_back ((*it).first); |
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
860 |
} |
8516
db748e56aea2
Update RR and PF scheduler for working wiht new LteAmc object
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8321
diff
changeset
|
861 |
uldci.m_tbSize = (m_amc->GetTbSizeFromMcs (uldci.m_mcs, rbPerFlow) / 8); |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
862 |
// NS_LOG_DEBUG (this << " UE " << (*it).first << " startPRB " << (uint32_t)uldci.m_rbStart << " nPRB " << (uint32_t)uldci.m_rbLen << " CQI " << cqi << " MCS " << (uint32_t)uldci.m_mcs << " TBsize " << uldci.m_tbSize << " RbAlloc " << rbAllocated); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
863 |
uldci.m_ndi = 1; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
864 |
uldci.m_cceIndex = 0; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
865 |
uldci.m_aggrLevel = 1; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
866 |
uldci.m_ueTxAntennaSelection = 3; // antenna selection OFF |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
867 |
uldci.m_hopping = false; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
868 |
uldci.m_n2Dmrs = 0; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
869 |
uldci.m_tpc = 0; // no power control |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
870 |
uldci.m_cqiRequest = false; // only period CQI at this stage |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
871 |
uldci.m_ulIndex = 0; // TDD parameter |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
872 |
uldci.m_dai = 1; // TDD parameter |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
873 |
uldci.m_freqHopping = 0; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
874 |
uldci.m_pdcchPowerOffset = 0; // not used |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
875 |
ret.m_dciList.push_back (uldci); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
876 |
|
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
877 |
// update TTI UE stats |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
878 |
itStats = m_flowStatsUl.find ((*it).first); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
879 |
if (itStats != m_flowStatsUl.end ()) |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
880 |
{ |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
881 |
(*itStats).second.lastTtiBytesTrasmitted = uldci.m_tbSize; |
8264
e3a90cfb6ac2
Bug-fix LENA 172 bug on schedulers in uplink when UE has CQI = 0
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8182
diff
changeset
|
882 |
// NS_LOG_DEBUG (this << " UE bytes txed " << (*it).second.lastTtiBytesTrasmitted); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
883 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
884 |
|
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
885 |
} |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
886 |
else |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
887 |
{ |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
888 |
NS_LOG_DEBUG (this << " No Stats for this allocated UE"); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
889 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
890 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
891 |
|
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
892 |
it++; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
893 |
if (it == m_ceBsrRxed.end ()) |
8080
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
894 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
895 |
// restart from the first |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
896 |
it = m_ceBsrRxed.begin (); |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
897 |
} |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
898 |
if (rbAllocated == m_cschedCellConfig.m_ulBandwidth) |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
899 |
{ |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
900 |
// Stop allocation: no more PRBs |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
901 |
m_nextRntiUl = (*it).first; |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
902 |
break; |
62d2fccef672
Refinements to RR and PF uplink scheduling
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8047
diff
changeset
|
903 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
904 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
905 |
while ((*it).first != m_nextRntiUl); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
906 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
907 |
|
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
908 |
// Update global UE stats |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
909 |
// update UEs stats |
8133
ea0cd92de3bb
PfFfMacScheduler::DoSchedUlTriggerReq fix bug m_flowStatsDl instead of m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8131
diff
changeset
|
910 |
for (itStats = m_flowStatsUl.begin (); itStats != m_flowStatsUl.end (); itStats++) |
8131
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
911 |
{ |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
912 |
(*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
913 |
// update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term Evolution, Ed Wiley) |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
914 |
(*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
915 |
// NS_LOG_DEBUG (this << " UE tot bytes " << (*itStats).second.totalBytesTransmitted); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
916 |
// NS_LOG_DEBUG (this << " UE avg thr " << (*itStats).second.lastAveragedThroughput); |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
917 |
(*itStats).second.lastTtiBytesTrasmitted = 0; |
3a0422147f8a
PfFfMacScheduler add m_flowStatsUl
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8080
diff
changeset
|
918 |
} |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
919 |
m_allocationMaps.insert (std::pair <uint16_t, std::vector <uint16_t> > (params.m_sfnSf, rbgAllocationMap)); |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
920 |
m_schedSapUser->SchedUlConfigInd (ret); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
921 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
922 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
923 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
924 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
925 |
PfFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
926 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
927 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
928 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
929 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
930 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
931 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
932 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
933 |
PfFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
934 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
935 |
NS_LOG_FUNCTION (this); |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
936 |
// TODO: Implementation of the API |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
937 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
938 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
939 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
940 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
941 |
PfFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider::SchedUlMacCtrlInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
942 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
943 |
NS_LOG_FUNCTION (this); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
944 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
945 |
std::map <uint16_t,uint8_t>::iterator it; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
946 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
947 |
for (unsigned int i = 0; i < params.m_macCeList.size (); i++) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
948 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
949 |
if ( params.m_macCeList.at (i).m_macCeType == MacCeListElement_s::BSR ) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
950 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
951 |
// buffer status report |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
952 |
uint16_t rnti = params.m_macCeList.at (i).m_rnti; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
953 |
it = m_ceBsrRxed.find (rnti); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
954 |
if (it == m_ceBsrRxed.end ()) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
955 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
956 |
// create the new entry |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
957 |
uint8_t bsr = params.m_macCeList.at (i).m_macCeValue.m_bufferStatus.at (0); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
958 |
m_ceBsrRxed.insert ( std::pair<uint16_t, uint8_t > (rnti, bsr)); // only 1 buffer status is working now |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
959 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
960 |
else |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
961 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
962 |
// update the CQI value |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
963 |
(*it).second = params.m_macCeList.at (i).m_macCeValue.m_bufferStatus.at (0); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
964 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
965 |
} |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
966 |
} |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
967 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
968 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
969 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
970 |
|
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
971 |
void |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
972 |
PfFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::SchedUlCqiInfoReqParameters& params) |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
973 |
{ |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
974 |
NS_LOG_FUNCTION (this); |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
975 |
// NS_LOG_DEBUG (this << " RX SFNID " << params.m_sfnSf << " delay " << (uint32_t)m_schedTtiDelay); |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
976 |
// correlate info on UL-CQIs with previous scheduling -> calculate m_sfnSf of transmission |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
977 |
uint32_t frameNo = (0x3FF & (params.m_sfnSf >> 4)); |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
978 |
uint32_t subframeNo = (0xF & params.m_sfnSf); |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
979 |
// NS_LOG_DEBUG (this << " sfn " << frameNo << " sbfn " << subframeNo); |
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
980 |
if (subframeNo <= m_schedTtiDelay) |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
981 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
982 |
frameNo--; |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
983 |
subframeNo = (10 + subframeNo - m_schedTtiDelay) % 11; |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
984 |
} |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
985 |
else |
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
986 |
{ |
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
987 |
subframeNo = (subframeNo - m_schedTtiDelay) % 11; |
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
988 |
} |
8319
8b45a9d26c06
Bug-fix update frame number codification in sfnId scheduler parameter
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8311
diff
changeset
|
989 |
uint16_t sfnSf = ((0x3FF & frameNo) << 4) | (0xF & subframeNo); |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
990 |
// NS_LOG_DEBUG (this << " Actual sfn " << frameNo << " sbfn " << subframeNo << " sfnSf " << sfnSf); |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
991 |
// retrieve the allocation for this subframe |
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
992 |
std::map <uint16_t, std::vector <uint16_t> >::iterator itMap; |
7947 | 993 |
std::map <uint16_t, std::vector <double> >::iterator itCqi; |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
994 |
itMap = m_allocationMaps.find (sfnSf); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
995 |
if (itMap == m_allocationMaps.end ()) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
996 |
{ |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
997 |
NS_LOG_DEBUG (this << " Does not find info on allocation, size : " << m_allocationMaps.size ()); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
998 |
return; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
999 |
} |
7943
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
1000 |
for (uint32_t i = 0; i < (*itMap).second.size (); i++) |
db21a8048ab9
PfFfMacScheduler update reception of UL-CQI coherently with previous allocation
mmiozzo
parents:
7940
diff
changeset
|
1001 |
{ |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1002 |
// convert from fixed point notation Sxxxxxxxxxxx.xxx to double |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1003 |
// NS_LOG_INFO (this << " i " << i << " size " << params.m_ulCqi.m_sinr.size () << " mapSIze " << (*itMap).second.size ()); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1004 |
double sinr = LteFfConverter::fpS11dot3toDouble (params.m_ulCqi.m_sinr.at (i)); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1005 |
//NS_LOG_DEBUG (this << " UE " << (*itMap).second.at (i) << " SINRfp " << params.m_ulCqi.m_sinr.at (i) << " sinrdb " << sinr); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1006 |
itCqi = m_ueCqi.find ((*itMap).second.at (i)); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1007 |
if (itCqi == m_ueCqi.end ()) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1008 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1009 |
// create a new entry |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1010 |
std::vector <double> newCqi; |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1011 |
for (uint32_t j = 0; j < m_cschedCellConfig.m_ulBandwidth; j++) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1012 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1013 |
if (i == j) |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1014 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1015 |
newCqi.push_back (sinr); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1016 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1017 |
else |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1018 |
{ |
8141
b3a8a85ee6f0
LENA-109 Uplink CQI support: introduced estimation of unkwnown CQI (average)
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8133
diff
changeset
|
1019 |
// initialize with NO_SINR value. |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1020 |
newCqi.push_back (NO_SINR); |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1021 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1022 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1023 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1024 |
m_ueCqi.insert (std::pair <uint16_t, std::vector <double> > ((*itMap).second.at (i), newCqi)); |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1025 |
// generate correspondent timer |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1026 |
m_ueCqiTimers.insert (std::pair <uint16_t, uint32_t > ((*itMap).second.at (i), m_cqiTimersThreshold)); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1027 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1028 |
else |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1029 |
{ |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1030 |
// update the value |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1031 |
(*itCqi).second.at (i) = sinr; |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1032 |
// update correspondent timer |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1033 |
std::map <uint16_t, uint32_t>::iterator itTimers; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1034 |
itTimers = m_ueCqiTimers.find ((*itMap).second.at (i)); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1035 |
(*itTimers).second = m_cqiTimersThreshold; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1036 |
|
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1037 |
} |
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1038 |
|
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1039 |
} |
7948 | 1040 |
// remove obsolete info on allocation |
8321
c674feef9d5f
Bug-fix UL Allocation Map storing for UL-CQI
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8319
diff
changeset
|
1041 |
m_allocationMaps.erase (itMap); |
8148
09e2d03022a2
run check-style on src/lte/model
Nicola Baldo <nbaldo@cttc.es>
parents:
8141
diff
changeset
|
1042 |
|
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
1043 |
return; |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
1044 |
} |
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
1045 |
|
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1046 |
void |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1047 |
PfFfMacScheduler::RefreshDlCqiMaps(void) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1048 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1049 |
// refresh DL CQI P01 Map |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1050 |
std::map <uint16_t,uint32_t>::iterator itP10 = m_p10CqiTimers.begin (); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1051 |
while (itP10!=m_p10CqiTimers.end ()) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1052 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1053 |
// NS_LOG_INFO (this << " P10-CQI for user " << (*itP10).first << " is " << (uint32_t)(*itP10).second << " thr " << (uint32_t)m_cqiTimersThreshold); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1054 |
if ((*itP10).second == 0) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1055 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1056 |
// delete correspondent entries |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1057 |
std::map <uint16_t,uint8_t>::iterator itMap = m_p10CqiRxed.find ((*itP10).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1058 |
NS_ASSERT_MSG (itMap != m_p10CqiRxed.end (), " Does not find CQI report for user " << (*itP10).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1059 |
NS_LOG_INFO (this << " P10-CQI exired for user " << (*itP10).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1060 |
m_p10CqiRxed.erase (itMap); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1061 |
m_p10CqiTimers.erase (itP10); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1062 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1063 |
else |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1064 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1065 |
(*itP10).second--; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1066 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1067 |
itP10++; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1068 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1069 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1070 |
// refresh DL CQI A30 Map |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1071 |
std::map <uint16_t,uint32_t>::iterator itA30 = m_a30CqiTimers.begin (); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1072 |
while (itA30!=m_a30CqiTimers.end ()) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1073 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1074 |
// NS_LOG_INFO (this << " A30-CQI for user " << (*itA30).first << " is " << (uint32_t)(*itA30).second << " thr " << (uint32_t)m_cqiTimersThreshold); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1075 |
if ((*itA30).second == 0) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1076 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1077 |
// delete correspondent entries |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1078 |
std::map <uint16_t,SbMeasResult_s>::iterator itMap = m_a30CqiRxed.find ((*itA30).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1079 |
NS_ASSERT_MSG (itMap != m_a30CqiRxed.end (), " Does not find CQI report for user " << (*itA30).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1080 |
NS_LOG_INFO (this << " A30-CQI exired for user " << (*itA30).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1081 |
m_a30CqiRxed.erase (itMap); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1082 |
m_a30CqiTimers.erase (itA30); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1083 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1084 |
else |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1085 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1086 |
(*itA30).second--; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1087 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1088 |
itA30++; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1089 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1090 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1091 |
return; |
7899
6cde5b6879e1
add missed file of pf-ff-mac-scheduler
Marco Miozzo <marco.miozzo@cttc.es>
parents:
diff
changeset
|
1092 |
} |
8311
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1093 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1094 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1095 |
void |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1096 |
PfFfMacScheduler::RefreshUlCqiMaps(void) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1097 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1098 |
// refresh UL CQI Map |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1099 |
std::map <uint16_t,uint32_t>::iterator itUl = m_ueCqiTimers.begin (); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1100 |
while (itUl!=m_ueCqiTimers.end ()) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1101 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1102 |
// NS_LOG_INFO (this << " UL-CQI for user " << (*itUl).first << " is " << (uint32_t)(*itUl).second << " thr " << (uint32_t)m_cqiTimersThreshold); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1103 |
if ((*itUl).second == 0) |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1104 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1105 |
// delete correspondent entries |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1106 |
std::map <uint16_t, std::vector <double> >::iterator itMap = m_ueCqi.find ((*itUl).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1107 |
NS_ASSERT_MSG (itMap != m_ueCqi.end (), " Does not find CQI report for user " << (*itUl).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1108 |
NS_LOG_INFO (this << " UL-CQI exired for user " << (*itUl).first); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1109 |
(*itMap).second.clear (); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1110 |
m_ueCqi.erase (itMap); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1111 |
m_ueCqiTimers.erase (itUl); |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1112 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1113 |
else |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1114 |
{ |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1115 |
(*itUl).second--; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1116 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1117 |
itUl++; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1118 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1119 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1120 |
return; |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1121 |
} |
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1122 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1123 |
|
ec257b681d85
Address LENA-173: CQI refresh procedure introduced in Pf and Rr schedulers
Marco Miozzo <marco.miozzo@cttc.es>
parents:
8264
diff
changeset
|
1124 |
} |