Commit1b589b9

committed

Switch to binary search

1 parente765a31 commit1b589b9Copy full SHA for 1b589b9

File tree

+17

-8

lines changed

+17

-8

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`#include<string>`
`2`	`2`
`3`	`3`	`#include"modem/SerialTransceiver.h"`
	`4`	`+#include"modem/db/DatabaseProtocol.h"`
	`5`	`+`
`4`	`6`	`// Bring them into the base namespace for easier use in arduino ide.`
`5`	`7`	`using firebase::modem::SerialTransceiver;`
	`8`	`+using firebase::modem::DatabaseProtocol;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class SerialProtocol {`
`20`	`20`
`21`	`21`	`/*`
`22`	`22`	`* Returns all commands this protocol supports, commands are single words.`
	`23`	`+ * Returned vector MUST be sorted.`
`23`	`24`	`*/`
`24`	`25`	`virtualconst std::vector<String>&commands()const = 0;`
`25`	`26`

Lines changed: 13 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include"SerialTransceiver.h"`
`2`	`2`
	`3`	`+#include<algorithm>`
	`4`	`+`
`3`	`5`	`namespacefirebase {`
`4`	`6`	`namespacemodem {`
`5`	`7`
`@@ -9,10 +11,6 @@ void SerialTransceiver::begin(Stream* serial) {`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`voidSerialTransceiver::RegisterProtocol(std::unique_ptr<SerialProtocol> protocol) {`
`12`		`-for (const String& command : protocol->commands()) {`
`13`		`- command_to_protocol_.insert({command, protocol.get()});`
`14`		`- }`
`15`		`-`
`16`	`14`	`protocols_.push_back(std::move(protocol));`
`17`	`15`	`}`
`18`	`16`
`@@ -24,13 +22,21 @@ void SerialTransceiver::loop() {`
`24`	`22`	`return;`
`25`	`23`	`}`
`26`	`24`
`27`		`-auto itr = command_to_protocol_.find(command_name);`
`28`		`-if (itr == command_to_protocol_.end()) {`
	`25`	`+bool command_found =false;`
	`26`	`+for (auto& protocol : protocols_) {`
	`27`	`+const std::vector<String>& commands = protocol->commands();`
	`28`	`+if (std::binary_search(commands.begin(), commands.end(), command_name)) {`
	`29`	`+ protocol->Execute(command_name, in_.get(), out_.get());`
	`30`	`+ command_found =true;`
	`31`	`+break;`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+`
	`35`	`+if (!command_found) {`
`29`	`36`	`in_->drain();`
`30`	`37`	`out_->println(String("-FAIL Invalid command '") + command_name +"'." );`
`31`	`38`	`return;`
`32`	`39`	`}`
`33`		`- itr->second->Execute(command_name, in_.get(), out_.get());`
`34`	`40`	`}`
`35`	`41`
`36`	`42`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ class SerialTransceiver {`
`26`	`26`	`std::unique_ptr<ArduinoInputStream> in_;`
`27`	`27`	`std::unique_ptr<ArduinoOutputStream> out_;`
`28`	`28`	`std::vector<std::unique_ptr<SerialProtocol>> protocols_;`
`29`		`- std::map<String, SerialProtocol*> command_to_protocol_;`
`30`	`29`	`};`
`31`	`30`
`32`	`31`	`}// modem`

Comments

(0)