PIIODevice remove init
picloud dispatcher fix
This commit is contained in:
@@ -211,7 +211,7 @@ void PIIODevice::startThreadedRead(ReadRetFunc func) {
|
||||
void PIIODevice::stopThreadedRead() {
|
||||
if (!isThreadedRead()) return;
|
||||
#ifdef MICRO_PIP
|
||||
read_thread.stop(true);
|
||||
read_thread.stop();
|
||||
#else
|
||||
if (reading_now) {
|
||||
read_thread.terminate();
|
||||
@@ -241,15 +241,7 @@ void PIIODevice::startThreadedWrite() {
|
||||
|
||||
void PIIODevice::stopThreadedWrite() {
|
||||
if (!write_thread.isRunning()) return;
|
||||
#ifdef MICRO_PIP
|
||||
write_thread.stop(true);
|
||||
#else
|
||||
write_thread.stop();
|
||||
if (!write_thread.waitForFinish(100)) {
|
||||
write_thread.terminate();
|
||||
threadedWriteTerminated();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -309,7 +301,7 @@ ssize_t PIIODevice::write(const void * data, ssize_t max_size) {
|
||||
|
||||
void PIIODevice::_init() {
|
||||
reading_now = false;
|
||||
opened_ = init_ = thread_started_ = false;
|
||||
opened_ = thread_started_ = false;
|
||||
raise_threaded_read_ = true;
|
||||
func_read = nullptr;
|
||||
ret_data_ = nullptr;
|
||||
@@ -319,7 +311,6 @@ void PIIODevice::_init() {
|
||||
setReopenTimeout(1000);
|
||||
#ifdef MICRO_PIP
|
||||
threaded_read_buffer_size = 512;
|
||||
//setThreadedReadBufferSize(512);
|
||||
#else
|
||||
threaded_read_buffer_size = 4096;
|
||||
#endif
|
||||
@@ -408,7 +399,6 @@ ullong PIIODevice::writeThreaded(const PIByteArray & data) {
|
||||
|
||||
|
||||
bool PIIODevice::open() {
|
||||
if (!init_) init();
|
||||
buffer_tr.resize(threaded_read_buffer_size);
|
||||
opened_ = openDevice();
|
||||
if (opened_) opened();
|
||||
|
||||
Reference in New Issue
Block a user