Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next

lib/include/srslte/common/metrics_hub.h

@@ -31,11 +31,13 @@ template<typename metrics_t>
 class metrics_hub : public periodic_thread
 {
 public:
-  metrics_hub() {
-    m         = NULL;
-  }
-  bool init(metrics_interface<metrics_t> *m_, float report_period_secs=1.0) {
-    m = m_; 
+  metrics_hub()
+    :m(NULL)
+    ,report_period_secs(1)
+  {}
+  bool init(metrics_interface<metrics_t> *m_, float report_period_secs_=1.0) {
+    m = m_;
+    report_period_secs = report_period_secs_;
     start_periodic(report_period_secs*1e6);
     return true;
   }
@@ -55,13 +57,13 @@ private:
       bzero(&metric, sizeof(metrics_t));
       m->get_metrics(metric);
       for (uint32_t i=0;i<listeners.size();i++) {
-        listeners[i]->set_metrics(metric);
+        listeners[i]->set_metrics(metric, report_period_secs);
       }
     }
   }
   metrics_interface<metrics_t> *m;
-  std::vector<metrics_listener<metrics_t>*> listeners; 
-
+  std::vector<metrics_listener<metrics_t>*> listeners;
+  float report_period_secs;
 };
 
 } // namespace srslte

lib/src/phy/common/phy_common.c

@@ -605,7 +605,7 @@ int srslte_band_get_fd_region(enum band_geographical_area region, srslte_earfcn_
 
 /* Returns the interval tti1-tti2 mod 10240 */
 uint32_t srslte_tti_interval(uint32_t tti1, uint32_t tti2) {
-  if (tti1 > tti2) {
+  if (tti1 >= tti2) {
     return tti1-tti2; 
   } else {
     return 10240-tti2+tti1;

srsue/hdr/mac/dl_harq.h

@@ -268,7 +268,7 @@ private:
             payload_buffer_ptr = harq_entity->demux_unit->request_buffer(cur_grant.n_bytes[tid]);
           }
           action->payload_ptr[tid] = payload_buffer_ptr;
-          if (!action->payload_ptr) {
+          if (!action->payload_ptr[tid]) {
             action->decode_enabled[tid] = false;
             Error("Can't get a buffer for TBS=%d\n", cur_grant.n_bytes[tid]);
             return;