qt: Use separate thread for read to increase performance

Author: bbogush

qt/main_window.cpp

@@ -63,6 +63,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
     prog = new Programmer(this);
     connect(prog, SIGNAL(writeChipCompleted(int)), this,
         SLOT(slotProgWriteCompleted(int)));
+    connect(prog, SIGNAL(readChipCompleted(int)), this,
+        SLOT(slotProgReadCompleted(int)));
 
     addChipDB(ui->chipSelectComboBox);
     connect(ui->chipSelectComboBox, SIGNAL(currentIndexChanged(int)),
@@ -184,7 +186,7 @@ void MainWindow::slotProgErase()
         chipInfo->size);
 }
 
-void MainWindow::readChipCb(int status)
+void MainWindow::slotProgReadCompleted(int status)
 {
     QByteArray ba = ui->chipSelectComboBox->currentText().toLatin1();
     ChipInfo *chipInfo = chipInfoGetByName(ba.data());
@@ -214,8 +216,7 @@ void MainWindow::slotProgRead()
         return;
     }
 
-    prog->readChip(std::bind(&MainWindow::readChipCb, this,
-        std::placeholders::_1), buffer, START_ADDRESS, readSize);
+    prog->readChip(buffer, START_ADDRESS, readSize);
 }
 
 void MainWindow::slotProgWriteCompleted(int status)

qt/main_window.h

@@ -40,6 +40,7 @@ class MainWindow : public QMainWindow
     void writeChipCb(int status);
 
 private slots:
+    void slotProgReadCompleted(int status);
     void slotProgWriteCompleted(int status);
 
 public slots:

qt/programmer.cpp

@@ -239,84 +239,21 @@ void Programmer::eraseChip(std::function<void(void)> callback, uint32_t addr,
         this, std::placeholders::_1), &writeData);
 }
 
-void Programmer::readRespReadChipCb(int status)
+void Programmer::readCb(int ret)
 {
-    uint size;
-    RespHeader *header;
-    uint32_t writeOffset = 0, readOffset = 0, bytes_left = 0;
-
-    if (status == SerialPortReader::READ_ERROR)
-        goto Error;
-
-    size = readData.size();
-    while ((bytes_left = size - readOffset))
-    {
-        if (readRespHeader(&readData, readOffset, header))
-            goto Error;
-
-        switch (header->code)
-        {
-        case RESP_STATUS:
-            if (header->info == STATUS_OK && header->info == STATUS_BAD_BLOCK)
-            {
-                if (handleBadBlock(&readData, readOffset))
-                    goto Error;
-                readOffset += sizeof(RespBadBlock);
-            }
-            else
-            {
-                qCritical() << "Programmer error: failed to read chip";
-                goto Error;
-            }
-            break;
-        case RESP_DATA:
-            if (header->info > CDC_BUF_SIZE - sizeof(RespHeader) || header->info > bytes_left)
-            {
-                qCritical() << "Wrong data length in response header:" << header->info;
-                goto Error;
-            }
-            memcpy(readChipBuf + writeOffset, header->data, header->info);
-            writeOffset += header->info;
-            readOffset += sizeof(RespHeader) + header->info;
-           break;
-        default:
-            handleWrongResp(header->code);
-            goto Error;
-        }
-    }
-
-    if (readChipLen == writeOffset)
-        readChipCb(0);
-    else
-    {
-        qCritical() << "Data was partialy received, size:" << writeOffset;
-        goto Error;
-    }
-
-    return;
-
-Error:
-    readChipCb(-1);
+    QObject::disconnect(&reader, SIGNAL(result(int)), this, SLOT(readCb(int)));
+    serialPortConnect();
+    emit readChipCompleted(ret);
 }
 
-void Programmer::readChip(std::function<void(int)> callback, uint8_t *buf,
-    uint32_t addr, uint32_t len)
+void Programmer::readChip(uint8_t *buf, uint32_t addr, uint32_t len)
 {
-    Cmd cmd = { .code = CMD_NAND_READ };
-    ReadCmd readCmd = { .cmd = cmd, .addr = addr, .len = len };
+    QObject::connect(&reader, SIGNAL(result(int)), this, SLOT(readCb(int)));
 
-    readData.clear();
-    serialPortReader->read(std::bind(&Programmer::readRespReadChipCb, this,
-        std::placeholders::_1), &readData, READ_TIMEOUT_MS,
-        std::numeric_limits<int>::max());
-
-    readChipCb = callback;
-    readChipBuf = buf;
-    readChipLen = len;
-    writeData.clear();
-    writeData.append((const char *)&readCmd, sizeof(readCmd));
-    serialPortWriter->write(std::bind(&Programmer::sendCmdCb,
-        this, std::placeholders::_1), &writeData);
+    /* Serial port object cannot be used in other thread */
+    serialPortDisconnect();
+    reader.init(CDC_DEV_NAME, SERIAL_PORT_SPEED, buf, addr, len);
+    reader.start();
 }
 
 void Programmer::writeCb(int ret)

qt/programmer.h

@@ -15,6 +15,7 @@
 #include "serial_port_writer.h"
 #include "serial_port_reader.h"
 #include "writer.h"
+#include "reader.h"
 #include "cmd.h"
 
 using namespace std;
@@ -25,12 +26,12 @@ class Programmer : public QObject
 
     QSerialPort serialPort;
     Writer writer;
+    Reader reader;
     QThread *currThread;
     bool isConn;
     std::function<void(ChipId)> readChipIdCb;
     std::function<void(void)> selectChipCb;
     std::function<void(void)> eraseChipCb;
-    std::function<void(int)> readChipCb;
     uint8_t *readChipBuf;
     uint32_t readChipLen;
     uint8_t *writeChipBuf;
@@ -49,7 +50,6 @@ class Programmer : public QObject
     void readRespChipIdCb(int status);
     void readRespSelectChipCb(int status);
     void readRespEraseChipCb(int status);
-    void readRespReadChipCb(int status);
     int handleStatus(RespHeader *respHead);
     int handleWrongResp(uint8_t code);
     int handleBadBlock(QByteArray *data, uint32_t offset);
@@ -70,17 +70,18 @@ class Programmer : public QObject
     void readChipId(std::function<void(ChipId)> callback);
     void eraseChip(std::function<void(void)> callback, uint32_t addr,
         uint32_t len);
-    void readChip(std::function<void(int)> callback, uint8_t *buf,
-        uint32_t addr, uint32_t len);
+    void readChip(uint8_t *buf, uint32_t addr, uint32_t len);
     void writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
         uint32_t pageSize);
     void selectChip(std::function<void(void)> callback, uint32_t chipNum);
 
 signals:
     void writeChipCompleted(int ret);
+    void readChipCompleted(int ret);
 
 private slots:
     void writeCb(int ret);
+    void readCb(int ret);
 };
 
 #endif // PROGRAMMER_H

qt/qt.pro

@@ -25,7 +25,8 @@ SOURCES += main.cpp\
     serial_port_reader.cpp \
     logger.cpp \
     buffer_table_model.cpp \
-    writer.cpp
+    writer.cpp \
+    reader.cpp
 
 HEADERS  += main_window.h \
     programmer.h \
@@ -35,7 +36,8 @@ HEADERS  += main_window.h \
     logger.h \
     buffer_table_model.h \
     cmd.h \
-    writer.h
+    writer.h \
+    reader.h
 
 FORMS    += main_window.ui