OSDN > Find Software > hardware-tools > SCM > hg > libqtmodem > Commit

hardware-tools
Fork
libatmodem
libqtmodem

libqtmodem: Commit

Revision	be98a6a361b0b1bbd37fabbd04edfc3fb6c93870 (tree)
Time	2018-10-08 09:45:30
Author	Sergey Gusarov
Commiter	Sergey Gusarov

Remove modems which are not present in the system anymore

diff -r 5b166653c6fe -r be98a6a361b0 include/qtmodem/modem_thread.hpp

--- a/include/qtmodem/modem_thread.hpp Mon Oct 08 03:02:44 2018 +0300

+++ b/include/qtmodem/modem_thread.hpp Mon Oct 08 03:45:30 2018 +0300

		@@ -10,9 +10,9 @@
10	10	#include <ctools/predef/external_headers.h>
11	11
12	12	CT_BEGIN_EXTERNAL_HEADERS
13		-# include <list>
14	13	# include <mutex>
15	14
	15	+# include <QList>
16	16	# include <QThread>
17	17	CT_END_EXTERNAL_HEADERS
18	18

		@@ -44,6 +44,21 @@
44	44
45	45	void terminateThread();
46	46
	47	+ bool isPortsAliveInOs() const
	48	+ {
	49	+ bool isAlive = true;
	50	+
	51	+ for (const auto& serialCommandsController : serialCommandsControllerList)
	52	+ {
	53	+ isAlive = isAlive && serialCommandsController->isPortAliveInOs();
	54	+
	55	+ if (!isAlive)
	56	+ break;
	57	+ }
	58	+
	59	+ return isAlive;
	60	+ }
	61	+
47	62	void getModemInfoFromPorts(ModemInfo& modemInfo)
48	63	{
49	64	std::lock_guard<std::mutex> lock(accessMutex);

		@@ -154,7 +169,7 @@
154	169	void slotReadyRead();
155	170	};
156	171
157		-using ModemThreadList = std::list<std::shared_ptr<ModemThread>>;
	172	+using ModemThreadList = QList<std::shared_ptr<ModemThread>>;
158	173
159	174	/* INDENT-OFF */
160	175	} // namespace qtmodem

diff -r 5b166653c6fe -r be98a6a361b0 include/qtmodem/serial_commands_controller.hpp

--- a/include/qtmodem/serial_commands_controller.hpp Mon Oct 08 03:02:44 2018 +0300

+++ b/include/qtmodem/serial_commands_controller.hpp Mon Oct 08 03:45:30 2018 +0300

		@@ -34,6 +34,8 @@
34	34
35	35	virtual ~SerialCommandsController() CT_NOEXCEPT CPT_OVERRIDE;
36	36
	37	+ bool isPortAliveInOs();
	38	+
37	39	virtual void createUnsolicitedController(const enum atmodem::UnsolicitedController::Mode mode, const std::set<atmodem::UnsolicitedCommand> commandSet) CPT_OVERRIDE;
38	40
39	41	virtual std::string getPortName() CPT_OVERRIDE

diff -r 5b166653c6fe -r be98a6a361b0 src/modem_scaner.cpp

--- a/src/modem_scaner.cpp Mon Oct 08 03:02:44 2018 +0300

+++ b/src/modem_scaner.cpp Mon Oct 08 03:45:30 2018 +0300

		@@ -114,9 +114,29 @@
114	114	{
115	115	// CT_TRACE_DEBUG("%d", QThread::currentThread());
116	116
	117	+ bool changedModemList = false;
	118	+
	119	+ int i = 0;
	120	+
	121	+ // Removed threads that is not associated with devices
	122	+ while (i < modemThreadList.size())
	123	+ {
	124	+ std::shared_ptr<ModemThread> modemThread = modemThreadList[i];
	125	+
	126	+ if (modemThread->isPortsAliveInOs())
	127	+ {
	128	+ i++;
	129	+ }
	130	+ else
	131	+ {
	132	+ changedModemList = true;
	133	+ modemThread->terminateThread();
	134	+ modemThreadList.removeAt(i);
	135	+ }
	136	+ }
	137	+
117	138	SerialPortInfoList availablePorts = QSerialPortInfo::availablePorts();
118	139	ModemInfoList modemInfoList;
119		- bool changedModemList = false;
120	140
121	141	while (availablePorts.count())
122	142	{

diff -r 5b166653c6fe -r be98a6a361b0 src/serial_commands_controller.cpp

--- a/src/serial_commands_controller.cpp Mon Oct 08 03:02:44 2018 +0300

+++ b/src/serial_commands_controller.cpp Mon Oct 08 03:45:30 2018 +0300

		@@ -11,6 +11,7 @@
11	11	# include <QCoreApplication>
12	12	CT_END_EXTERNAL_HEADERS
13	13
	14	+#include <ctools/os/io.h>
14	15	#include <ctools/trace.h>
15	16
16	17	#include <cpptools/exceptions/runtime.hpp>

		@@ -46,6 +47,11 @@
46	47	closeComPort();
47	48	}
48	49
	50	+bool SerialCommandsController::isPortAliveInOs()
	51	+{
	52	+ return ctools::isFileExists(QTT_LATIN_PRINTABLE(serialPortInfo.systemLocation()));
	53	+}
	54	+
49	55	void SerialCommandsController::createUnsolicitedController(const enum atmodem::UnsolicitedController::Mode mode, const std::set<atmodem::UnsolicitedCommand> commandSet)
50	56	{
51	57	CPT_THROW_IF(unsolicitedController.get(), cpptools::exceptions::IllegalStateException,