Changeset 6443 in ntrip for trunk/BNC/src/bncephuser.cpp

Timestamp:

Dec 26, 2014, 12:47:27 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncephuser.cpp (modified) (2 diffs)

trunk/BNC/src/bncephuser.cpp

@@ -67 +67 @@
 ////////////////////////////////////////////////////////////////////////////
 bncEphUser::~bncEphUser() {
-  QMapIterator<QString, t_ephPair*> it(_eph);
+  QMapIterator<QString, deque<t_eph*> > it(_eph);
   while (it.hasNext()) {
     it.next();
-    delete it.value();
+    const deque<t_eph*>& qq = it.value();
+    for (unsigned ii = 0; ii < qq.size(); ii++) {
+      delete qq[ii];
+    }
   }
 }
@@ -137 +140 @@
   QString prn(newEph->prn().toString().c_str());
 
-  if (_eph.contains(prn)) {
-    if (newEph->isNewerThan(_eph.value(prn)->last)) {
-      delete _eph.value(prn)->prev;
-      _eph.value(prn)->prev = _eph.value(prn)->last;
-      _eph.value(prn)->last = newEph;
-      ephBufferChanged();
-      return success;
+  const t_eph* ephOld = ephLast(prn);
+
+  if (ephOld == 0 || newEph->isNewerThan(ephOld)) {
+    deque<t_eph*>& qq = _eph[prn];
+    qq.push_back(newEph);
+    if (qq.size() > _maxQueueSize) {
+      delete qq.front();
+      qq.pop_front();
     }
-  }
-  else {
-    _eph.insert(prn, new t_ephPair(newEph));
     ephBufferChanged();
     return success;
   }
-
-  return failure;
+  else {
+    return failure;
+  }
 }