SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@812 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2019-06-25 12:12:45 +00:00
parent 6c7c81559c
commit 95fd35f9a7
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src_main/containers/piqueue.h
View File

@@ -26,17 +26,24 @@
#define PIQUEUE_H #define PIQUEUE_H
#include "pideque.h" #include "pideque.h"
#include "pivector.h"
template<typename T> template<typename T>
class PIP_EXPORT PIQueue: public PIDeque<T> { class PIP_EXPORT PIQueue: public PIDeque<T> {
public: public:
PIQueue() {;} PIQueue() {}
virtual ~PIQueue() {;} virtual ~PIQueue() {}
PIDeque<T> & enqueue(const T & v) {PIDeque<T>::push_front(v); return *this;} PIDeque<T> & enqueue(const T & v) {PIDeque<T>::push_front(v); return *this;}
T dequeue() {return PIDeque<T>::take_back();} T dequeue() {return PIDeque<T>::take_back();}
T & head() {return PIDeque<T>::back();} T & head() {return PIDeque<T>::back();}
const T & head() const {return PIDeque<T>::back();} const T & head() const {return PIDeque<T>::back();}
PIVector<T> toVector() {PIVector<T> v(PIDeque<T>::size()); for (uint i = 0; i < PIDeque<T>::size(); ++i) v[i] = PIDeque<T>::at(i); return v;} PIVector<T> toVector() {
PIVector<T> v(PIDeque<T>::size());
for (uint i = 0; i < PIDeque<T>::size(); ++i)
v[i] = PIDeque<T>::at(i);
return v;
}
}; };
#endif // PIQUEUE_H #endif // PIQUEUE_H

4
src_main/io_devices/pibinarylog.cpp
View File

@@ -487,13 +487,13 @@ void PIBinaryLog::parseLog(PIFile * f, PIBinaryLog::BinLogInfo * info, PIVector<
PIByteArray ba; PIByteArray ba;
BinLogRecord br; BinLogRecord br;
bool first = true; bool first = true;
llong hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray); size_t hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray);
ba.resize(hdr_size); ba.resize(hdr_size);
while (1) { while (1) {
ba.resize(hdr_size); ba.resize(hdr_size);
{ {
PIMutexLocker _ml(file_mutex); PIMutexLocker _ml(file_mutex);
if (f->read(ba.data(), ba.size_s()) > 0) { if (f->read(ba.data(), ba.size()) > 0) {
ba >> br.id >> br.size >> br.timestamp; ba >> br.id >> br.size >> br.timestamp;
} else } else
break; break;