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

This commit is contained in:
2017-09-04 08:03:26 +00:00
parent 584ae31627
commit b67512d38c

View File

@@ -119,7 +119,10 @@ void PIBaseTransfer::received(PIByteArray data) {
int s = pm_string.find('+'), s1 = send_queue; int s = pm_string.find('+'), s1 = send_queue;
while (s <= (int)h.id && s > 0) { while (s <= (int)h.id && s > 0) {
send_queue--; send_queue--;
if (s >= 0) pm_string[s] = '-'; if (s >= 0) {
pm_string[s] = '-';
bytes_cur -= packet_size;
}
send_up = 0; send_up = 0;
if (send_queue < 0) { if (send_queue < 0) {
send_queue = 0; send_queue = 0;
@@ -319,7 +322,7 @@ bool PIBaseTransfer::send_process() {
send_queue = 0; send_queue = 0;
mutex_send.unlock(); mutex_send.unlock();
piMSleep(10); piMSleep(10);
state_string = "sending+"; state_string = "sending more";
while (rtm.elapsed_s() < timeout_) { while (rtm.elapsed_s() < timeout_) {
//piCoutObj << "recovering..."; //piCoutObj << "recovering...";
mutex_session.lock(); mutex_session.lock();