etherlabmaster: comparison tool/Command.cpp

equal deleted inserted replaced

-:04fdb4abf120
+:ce2fae4d3c4f
 using namespace std;
 #include "Command.h"
 #include "MasterDevice.h"
 #include "NumberListParser.h"
+/*****************************************************************************/
+typedef map<uint16_t, ec_ioctl_config_t> AliasMap;
+typedef map<uint16_t, AliasMap> ConfigMap;
 /*****************************************************************************/
 class MasterIndexParser:
 public NumberListParser
 class ConfigAliasParser:
 public NumberListParser
 {
 public:
-ConfigAliasParser(ec_ioctl_master_t &master, MasterDevice &dev):
+ConfigAliasParser(unsigned int maxAlias):
-master(master), dev(dev) {}
+maxAlias(maxAlias) {}
 protected:
-int getMax() {
+int getMax() { return maxAlias; };
-unsigned int i;
-uint16_t maxAlias = 0;
-for (i = 0; i < master.config_count; i++) {
-ec_ioctl_config_t config;
-dev.getConfig(&config, i);
-if (config.alias > maxAlias) {
-maxAlias = config.alias;
-}
-}
-return maxAlias ? maxAlias : -1;
-};
 private:
-ec_ioctl_master_t &master;
+unsigned int maxAlias;
-MasterDevice &dev;
 };
 /*****************************************************************************/
 class PositionParser:
 return count - 1;
 };
 private:
 const unsigned int count;
+};
+/*****************************************************************************/
+class AliasPositionParser:
+public NumberListParser
+{
+public:
+AliasPositionParser(const AliasMap &aliasMap):
+aliasMap(aliasMap) {}
+protected:
+int getMax() {
+AliasMap::const_iterator i;
+int maxPos = -1;
+for (i = aliasMap.begin(); i != aliasMap.end(); i++) {
+if (i->first > maxPos) {
+maxPos = i->first;
+}
+}
+return maxPos;
+};
+private:
+const AliasMap &aliasMap;
 };
 /*****************************************************************************/
 Command::Command(const string &name, const string &briefDesc):
 /*****************************************************************************/
 unsigned int Command::getSingleMasterIndex() const
 {
 MasterIndexList masterIndices = getMasterIndices();
 if (masterIndices.size() != 1) {
 stringstream err;
 err << getName() << " requires to select a single master!";
 throwInvalidUsageException(err);
 }
 return masterIndices.front();
 }
 /*****************************************************************************/
 if (aliases == "-") { // no alias given
 PositionParser pp(master.slave_count);
 NumberListParser::List posList = pp.parse(positions.c_str());
 NumberListParser::List::const_iterator pi;
 for (pi = posList.begin(); pi != posList.end(); pi++) {
-m.getSlave(&slave, *pi);
+if (*pi < master.slave_count) {
-list.push_back(slave);
+m.getSlave(&slave, *pi);
+list.push_back(slave);
+}
 }
 } else { // aliases given
 SlaveAliasParser ap(master, m);
 NumberListParser::List aliasList = ap.parse(aliases.c_str());
 NumberListParser::List::const_iterator ai;
 NumberListParser::List::const_iterator pi;
 for (pi = posList.begin(); pi != posList.end(); pi++) {
 if (*pi < aliasSlaves.size()) {
 list.push_back(aliasSlaves[*pi]);
-} else {
-stringstream err;
-err << "Warning: Slave " << *ai << ":" << *pi
-<< " does not exist on master " << m.getIndex();
-throwCommandException(err);
 }
 }
 }
 }
 ConfigList list;
 stringstream err;
 m.getMaster(&master);
-if (aliases == "-") { // no alias given
+if (aliases == "-" && positions == "-") { // shortcut
-PositionParser pp(master.config_count);
+for (i = 0; i < master.config_count; i++) {
-NumberListParser::List posList = pp.parse(positions.c_str());
+m.getConfig(&config, i);
-NumberListParser::List::const_iterator pi;
-for (pi = posList.begin(); pi != posList.end(); pi++) {
-m.getConfig(&config, *pi); // FIXME use sorted list
 list.push_back(config);
 }
-} else { // alias given
+} else { // take the long way home...
-ConfigAliasParser ap(master, m);
+ConfigMap configs;
+uint16_t maxAlias = 0;
+// fill cascaded map structure with all configs
+for (i = 0; i < master.config_count; i++) {
+m.getConfig(&config, i);
+AliasMap &aliasMap = configs[config.alias];
+aliasMap[config.position] = config;
+if (config.alias > maxAlias) {
+maxAlias = config.alias;
+}
+}
+ConfigAliasParser ap(maxAlias);
 NumberListParser::List aliasList = ap.parse(aliases.c_str());
 NumberListParser::List::const_iterator ai;
 for (ai = aliasList.begin(); ai != aliasList.end(); ai++) {
-// gather configs with that alias
+ConfigMap::iterator ci = configs.find(*ai);
-map<uint16_t, ec_ioctl_config_t> aliasConfigs;
+if (ci == configs.end()) {
+continue;
-int maxPos = -1;
+}
-for (i = 0; i < master.config_count; i++) {
-m.getConfig(&config, i);
+AliasMap &aliasMap = configs[*ai];
-if (config.alias == *ai) {
+AliasPositionParser pp(aliasMap);
-aliasConfigs[config.position] = config;
-if (config.position > maxPos) {
-maxPos = config.position;
-}
-}
-}
-PositionParser pp(maxPos + 1);
 NumberListParser::List posList = pp.parse(positions.c_str());
 NumberListParser::List::const_iterator pi;
 for (pi = posList.begin(); pi != posList.end(); pi++) {
-map<uint16_t, ec_ioctl_config_t>::const_iterator ci;
+AliasMap::const_iterator ci;
-ci = aliasConfigs.find(*pi);
+ci = aliasMap.find(*pi);
-if (ci != aliasConfigs.end()) {
+if (ci != aliasMap.end()) {
 list.push_back(ci->second);
-} else {
-stringstream err;
-err << "Warning: Config " << *ai << ":" << *pi
-<< " does not exist on master " << m.getIndex();
-throwCommandException(err);
 }
 }
 }
 }
 PositionParser pp(master.domain_count);
 NumberListParser::List domList = pp.parse(domains.c_str());
 NumberListParser::List::const_iterator di;
 for (di = domList.begin(); di != domList.end(); di++) {
-ec_ioctl_domain_t d;
+if (*di < master.domain_count) {
-m.getDomain(&d, *di);
+ec_ioctl_domain_t d;
-list.push_back(d);
+m.getDomain(&d, *di);
+list.push_back(d);
+}
 }
 return list;
 }

changeset 2015	ce2fae4d3c4f
parent 2014	1d2111370ad5
child 2421	bc2d4bf9cbe5
child 2589	2b9c78543663