mirror of https://github.com/pvnis/srsRAN_4G.git
created tti_point type and unit test. Added also the tti_point to the scheduler harqs, and rrc procedure
Francisco Paisana
5 years ago
committed by
Francisco Paisana
parent
e824cbd251
commit
5330249625
@ -0,0 +1,122 @@
|
||||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SRSLTE_TTI_POINT_H
|
||||
#define SRSLTE_TTI_POINT_H
|
||||
|
||||
#include "logmap.h"
|
||||
#include <cstdint>
|
||||
#include <limits>
|
||||
|
||||
namespace srslte {
|
||||
|
||||
struct tti_point {
|
||||
constexpr tti_point() = default;
|
||||
explicit tti_point(uint32_t tti_val_) : tti_val(tti_val_ % 10240)
|
||||
{
|
||||
if (tti_val_ > std::numeric_limits<uint32_t>::max() / 2) {
|
||||
// there was a overflow at tti initialization
|
||||
uint32_t diff = std::numeric_limits<uint32_t>::max() - tti_val_;
|
||||
if (diff < 10240) {
|
||||
tti_val = 10240 - diff - 1;
|
||||
} else {
|
||||
srslte::logmap::get("COMMON")->error("Invalid TTI point assigned\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
void reset() { tti_val = std::numeric_limits<uint32_t>::max(); }
|
||||
uint32_t sf_idx() const { return tti_val % 10; }
|
||||
uint32_t sfn() const { return tti_val / 10; }
|
||||
|
||||
// comparison operators
|
||||
bool operator==(const tti_point& other) const { return tti_val == other.tti_val; }
|
||||
bool operator!=(const tti_point& other) const { return tti_val != other.tti_val; }
|
||||
bool operator<(const tti_point& other) const
|
||||
{
|
||||
bool lower_val = tti_val < other.tti_val;
|
||||
bool wrap_flag = (lower_val ? other.tti_val - tti_val : tti_val - other.tti_val) > 10240 / 2;
|
||||
return (lower_val != wrap_flag);
|
||||
}
|
||||
bool operator<=(const tti_point& other) const { return *this == other or *this < other; }
|
||||
bool operator>(const tti_point& other) const { return not(*this <= other); }
|
||||
bool operator>=(const tti_point& other) const { return not(*this < other); }
|
||||
|
||||
// add/subtract
|
||||
int operator-(const tti_point& other) const
|
||||
{
|
||||
int diff = static_cast<int>(tti_val) - static_cast<int>(other.tti_val);
|
||||
if (diff > 10240 / 2) {
|
||||
return diff - 10240;
|
||||
}
|
||||
if (diff < -10240 / 2) {
|
||||
return diff + 10240;
|
||||
}
|
||||
return diff;
|
||||
}
|
||||
tti_point& operator+=(uint32_t jump)
|
||||
{
|
||||
tti_val = (tti_val + jump) % 10240;
|
||||
return *this;
|
||||
}
|
||||
tti_point& operator-=(uint32_t jump)
|
||||
{
|
||||
tti_val -= jump - ((tti_val < jump) ? 10240 : 0);
|
||||
return *this;
|
||||
}
|
||||
tti_point& operator++() { return this->operator+=(1); }
|
||||
tti_point operator++(int)
|
||||
{
|
||||
tti_point ret{tti_val};
|
||||
this-> operator+=(1);
|
||||
return ret;
|
||||
}
|
||||
bool is_valid() const { return tti_val < 10240; }
|
||||
explicit operator uint32_t() const { return tti_val; }
|
||||
uint32_t to_uint() const { return tti_val; }
|
||||
bool is_in_interval(tti_point l, tti_point u) const { return (*this >= l and *this <= u); }
|
||||
|
||||
private:
|
||||
uint32_t tti_val = std::numeric_limits<uint32_t>::max();
|
||||
};
|
||||
inline tti_point operator+(tti_point tti, uint32_t jump)
|
||||
{
|
||||
return tti_point{(uint32_t)tti + jump};
|
||||
}
|
||||
inline tti_point operator+(uint32_t jump, tti_point tti)
|
||||
{
|
||||
return tti_point{(uint32_t)tti + jump};
|
||||
}
|
||||
inline tti_point operator-(tti_point tti, uint32_t jump)
|
||||
{
|
||||
return tti_point{(uint32_t)tti + 10240 - jump};
|
||||
}
|
||||
inline tti_point max(tti_point tti1, tti_point tti2)
|
||||
{
|
||||
return tti1 > tti2 ? tti1 : tti2;
|
||||
}
|
||||
inline tti_point min(tti_point tti1, tti_point tti2)
|
||||
{
|
||||
return tti1 < tti2 ? tti1 : tti2;
|
||||
}
|
||||
|
||||
} // namespace srslte
|
||||
|
||||
#endif // SRSLTE_TTI_POINT_H
|
||||
@ -0,0 +1,82 @@
|
||||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "srslte/common/test_common.h"
|
||||
#include "srslte/common/tti_point.h"
|
||||
|
||||
using srslte::tti_point;
|
||||
|
||||
int test_tti_type()
|
||||
{
|
||||
// TEST: constructors
|
||||
tti_point tti1;
|
||||
TESTASSERT(not tti1.is_valid());
|
||||
tti1 = tti_point{5};
|
||||
TESTASSERT(tti1.is_valid());
|
||||
|
||||
// TEST: operators
|
||||
TESTASSERT(tti1 != tti_point{2});
|
||||
TESTASSERT(tti1 == tti_point{5});
|
||||
TESTASSERT(tti1 <= tti_point{5});
|
||||
TESTASSERT(tti1 >= tti_point{5});
|
||||
TESTASSERT(tti1 < tti_point{6});
|
||||
TESTASSERT(tti1 > tti_point{4});
|
||||
TESTASSERT(tti1 - tti_point{2} == 3);
|
||||
TESTASSERT(tti1++ == tti_point{5});
|
||||
TESTASSERT(tti1 == tti_point{6});
|
||||
TESTASSERT(++tti1 == tti_point{7});
|
||||
|
||||
// TEST: wrap arounds
|
||||
TESTASSERT(tti_point{10239} - tti_point{1} == -2);
|
||||
TESTASSERT(tti_point{10239} < tti_point{1});
|
||||
TESTASSERT(tti_point{10238} - tti_point{10239} == -1);
|
||||
TESTASSERT(tti_point{10238} < tti_point{10239});
|
||||
TESTASSERT(tti_point{10239} - tti_point{10238} == 1);
|
||||
TESTASSERT(tti_point{10239} > tti_point{10238});
|
||||
TESTASSERT(tti_point{1} - tti_point{10239} == 2);
|
||||
TESTASSERT(tti_point{1} > tti_point{10239});
|
||||
|
||||
tti1 = tti_point{10239};
|
||||
TESTASSERT(tti1++ == tti_point{10239});
|
||||
TESTASSERT(tti1 == tti_point{0});
|
||||
|
||||
// TEST: tti skips
|
||||
tti1 = tti_point{10239};
|
||||
tti1 += 10;
|
||||
TESTASSERT(tti1 == tti_point{9});
|
||||
tti1 -= 11;
|
||||
TESTASSERT(tti1 == tti_point{10238});
|
||||
tti1 -= 10237;
|
||||
TESTASSERT(tti1 == (tti_point)1);
|
||||
|
||||
// TEST: wrap initializations
|
||||
TESTASSERT(tti_point{1u - 2u} == tti_point{10239});
|
||||
TESTASSERT(tti_point{1u - 100u} == tti_point{10141});
|
||||
TESTASSERT(tti_point{10239u + 3u} == tti_point{2});
|
||||
|
||||
return SRSLTE_SUCCESS;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
TESTASSERT(test_tti_type() == SRSLTE_SUCCESS);
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue