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

Browse Source
This commit is contained in:
Бычков Андрей
2016-10-10 16:47:05 +00:00
parent 2e8cee48f7
commit bf2f224eb9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/console/piterminal.cpp
View File

@@ -190,7 +190,7 @@ void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers
*/ */
default: { default: {
//piCout << flags; //piCout << flags;
int mod = 0; //int mod = 0;
if (m[PIKbdListener::Shift]) m |= 1; if (m[PIKbdListener::Shift]) m |= 1;
if (m[PIKbdListener::Alt]) m |= 2; if (m[PIKbdListener::Alt]) m |= 2;
if (m[PIKbdListener::Ctrl]) m |= 4; if (m[PIKbdListener::Ctrl]) m |= 4;

10
src/thread/pipipelinethread.h
View File

@@ -127,6 +127,7 @@ private:
} }
if (next_overload && wait_next_pipe) { if (next_overload && wait_next_pipe) {
mutex.unlock(); mutex.unlock();
piCoutObj << &next_overload;
calculated(last, &next_overload); calculated(last, &next_overload);
piMSleep(10); piMSleep(10);
} else { } else {
@@ -140,18 +141,19 @@ private:
mutex_l.unlock(); mutex_l.unlock();
cnt++; cnt++;
// next_overload = true; // next_overload = true;
piCoutObj << &next_overload;
calculated(r, &next_overload); calculated(r, &next_overload);
} }
} }
} }
PIQueue<Tin> in;
Tout last;
PIMutex mutex; PIMutex mutex;
PIMutex mutex_l; PIMutex mutex_l;
ullong cnt;
uint max_size;
bool wait_next_pipe; bool wait_next_pipe;
bool next_overload; bool next_overload;
uint max_size;
ullong cnt;
PIQueue<Tin> in;
Tout last;
}; };
#endif // PIPIPELINETHREAD_H #endif // PIPIPELINETHREAD_H

2
utils/system_daemon/daemon.h
View File

@@ -181,6 +181,7 @@ private:
void requestChDir(const PIString & d); void requestChDir(const PIString & d);
void sendDirToRemote(Remote * r); void sendDirToRemote(Remote * r);
bool inited__;
mutable PIStringList available_daemons; mutable PIStringList available_daemons;
PITimer dtimer; PITimer dtimer;
PIString conn_name; PIString conn_name;
@@ -197,7 +198,6 @@ private:
Remote * _self; Remote * _self;
RemoteMode mode; RemoteMode mode;
int offset, cur, height; int offset, cur, height;
bool inited__;
}; };
inline PIByteArray & operator <<(PIByteArray & b, const Daemon::HostInfo & v) { inline PIByteArray & operator <<(PIByteArray & b, const Daemon::HostInfo & v) {