Switch to binary search

Author: ed7coyne

src/SerialTransceiver.h

@@ -1,5 +1,8 @@
 #include <string>
 
 #include "modem/SerialTransceiver.h"
+#include "modem/db/DatabaseProtocol.h"
+
 // Bring them into the base namespace for easier use in arduino ide.
 using firebase::modem::SerialTransceiver;
+using firebase::modem::DatabaseProtocol;

src/modem/SerialProtocol.h

@@ -20,6 +20,7 @@ class SerialProtocol {
 
   /*
    * Returns all commands this protocol supports, commands are single words.
+   * Returned vector MUST be sorted.
    */
   virtual const std::vector<String>& commands() const = 0;
 

src/modem/SerialTransceiver.cpp

@@ -1,5 +1,7 @@
 #include "SerialTransceiver.h"
 
+#include <algorithm>
+
 namespace firebase {
 namespace modem {
 
@@ -9,10 +11,6 @@ void SerialTransceiver::begin(Stream* serial) {
 }
 
 void SerialTransceiver::RegisterProtocol(std::unique_ptr<SerialProtocol> protocol) {
-  for (const String& command : protocol->commands()) {
-    command_to_protocol_.insert({command, protocol.get()});
-  }
-
   protocols_.push_back(std::move(protocol));
 }
 
@@ -24,13 +22,21 @@ void SerialTransceiver::loop() {
     return;
   }
 
-  auto itr = command_to_protocol_.find(command_name);
-  if (itr == command_to_protocol_.end()) {
+  bool command_found = false;
+  for (auto& protocol : protocols_) {
+    const std::vector<String>& commands = protocol->commands();
+    if (std::binary_search(commands.begin(), commands.end(), command_name)) {
+      protocol->Execute(command_name, in_.get(), out_.get());
+      command_found = true;
+      break;
+    }
+  }
+
+  if (!command_found) {
     in_->drain();
     out_->println(String("-FAIL Invalid command '") + command_name + "'." );
     return;
   }
-  itr->second->Execute(command_name, in_.get(), out_.get());
 }
 
 

src/modem/SerialTransceiver.h

@@ -26,7 +26,6 @@ class SerialTransceiver {
   std::unique_ptr<ArduinoInputStream> in_;
   std::unique_ptr<ArduinoOutputStream> out_;
   std::vector<std::unique_ptr<SerialProtocol>> protocols_;
-  std::map<String, SerialProtocol*> command_to_protocol_;
 };
 
 }  // modem