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@180 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-02-16 13:11:26 +00:00
parent 697b39124c
commit f559fa93d8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/io/pibinarylog.cpp
View File

@@ -359,6 +359,7 @@ bool PIBinaryLog::checkFileHeader() {
PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() { PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() {
logmutex.lock();
PIByteArray ba; PIByteArray ba;
BinLogRecord br; BinLogRecord br;
lastrecord.id = 0; lastrecord.id = 0;
@@ -369,6 +370,7 @@ PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() {
ba >> br.id >> br.size >> br.timestamp; ba >> br.id >> br.size >> br.timestamp;
} else { } else {
br.id = -1; br.id = -1;
logmutex.unlock();
return br; return br;
} }
if (br.id > 0 && br.size > 0) { if (br.id > 0 && br.size > 0) {
@@ -379,6 +381,7 @@ PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() {
lastrecord = br; lastrecord = br;
if (br.id == 0) fileError(); if (br.id == 0) fileError();
moveIndex(index_pos.value(file.pos(), -1)); moveIndex(index_pos.value(file.pos(), -1));
logmutex.unlock();
return br; return br;
} }
@@ -497,12 +500,14 @@ bool PIBinaryLog::createIndex() {
void PIBinaryLog::seekTo(int rindex) { void PIBinaryLog::seekTo(int rindex) {
logmutex.lock();
if (rindex < index.size_s() && rindex >= 0) { if (rindex < index.size_s() && rindex >= 0) {
file.seek(index[rindex].pos); file.seek(index[rindex].pos);
moveIndex(index_pos.value(file.pos(), -1)); moveIndex(index_pos.value(file.pos(), -1));
play_time = index[rindex].timestamp.toMilliseconds(); play_time = index[rindex].timestamp.toMilliseconds();
lastrecord.timestamp = index[rindex].timestamp; lastrecord.timestamp = index[rindex].timestamp;
} }
logmutex.unlock();
} }

1
src/io/pibinarylog.h
View File

@@ -293,6 +293,7 @@ private:
PIFile file; PIFile file;
BinLogRecord lastrecord; BinLogRecord lastrecord;
PISystemTime startlogtime, play_delay, split_time; PISystemTime startlogtime, play_delay, split_time;
PIMutex logmutex;
double play_time, play_speed; double play_time, play_speed;
llong split_size; llong split_size;
int write_count, split_count, default_id, current_index; int write_count, split_count, default_id, current_index;