nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected comments, increase verbosity when probing particular scan config by command line, also reveal files loaded by instructions in "info" command

Browse Source
This commit is contained in:
john30
2016-04-30 16:54:45 +02:00
parent 4089923bd9
commit 41bd113141
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+19 -8
View File
@@ -247,7 +247,7 @@ error_t parse_opt(int key, char *arg, struct argp_state *state)
break; break;
// eBUS options: // eBUS options:
case 'a': // --address=FF case 'a': // --address=31
opt->address = (unsigned char)parseInt(arg, 16, 0, 0xff, result); opt->address = (unsigned char)parseInt(arg, 16, 0, 0xff, result);
if (result != RESULT_OK || !isMaster(opt->address)) { if (result != RESULT_OK || !isMaster(opt->address)) {
argp_error(state, "invalid address"); argp_error(state, "invalid address");
@@ -268,7 +268,7 @@ error_t parse_opt(int key, char *arg, struct argp_state *state)
return EINVAL; return EINVAL;
} }
break; break;
case O_ACQRET: // --acquireretries=2 case O_ACQRET: // --acquireretries=3
opt->acquireRetries = parseInt(arg, 10, 0, 10, result); opt->acquireRetries = parseInt(arg, 10, 0, 10, result);
if (result != RESULT_OK) { if (result != RESULT_OK) {
argp_error(state, "invalid acquireretries"); argp_error(state, "invalid acquireretries");
@@ -357,7 +357,7 @@ error_t parse_opt(int key, char *arg, struct argp_state *state)
return EINVAL; return EINVAL;
} }
break; break;
case O_LOGLEV: // --loglevel=event case O_LOGLEV: // --loglevel=notice
if (!setLogLevel(arg)) { if (!setLogLevel(arg)) {
argp_error(state, "invalid loglevel"); argp_error(state, "invalid loglevel");
return EINVAL; return EINVAL;
@@ -651,6 +651,17 @@ static result_t readConfigFiles(const string path, const string extension, Messa
return RESULT_OK; return RESULT_OK;
}; };
/**
* Helper method for logging loading of a configuration file.
* @param messages the @a MessageMap instance.
* @param address the address for which the file was loaded.
* @param file the name of the loaded file.
*/
void logFileLoaded(MessageMap* messages, const unsigned char address, string file)
{
messages->addLoadedFile(address, file);
}
result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive) result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive)
{ {
logInfo(lf_main, "loading configuration files from %s", opt.configPath); logInfo(lf_main, "loading configuration files from %s", opt.configPath);
@@ -674,7 +685,7 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive)
logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str()); logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str());
ostringstream log; ostringstream log;
result = messages->executeInstructions(verbose, log); result = messages->executeInstructions(log, logFileLoaded);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str()); logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str());
else if (log.tellp() > 0) else if (log.tellp() > 0)
@@ -685,7 +696,7 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive)
return result; return result;
} }
result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolString& data, string& relativeFile) result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolString& data, string& relativeFile, bool verbose)
{ {
PartType partType; PartType partType;
if (isMaster(address)) { if (isMaster(address)) {
@@ -829,12 +840,12 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
} }
logNotice(lf_main, "read scan config file %s for ID \"%s\", SW%4.4d, HW%4.4d", best.c_str(), ident.c_str(), sw, hw); logNotice(lf_main, "read scan config file %s for ID \"%s\", SW%4.4d, HW%4.4d", best.c_str(), ident.c_str(), sw, hw);
result = messages->resolveConditions(false); result = messages->resolveConditions(verbose);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str()); logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str());
ostringstream log; ostringstream log;
result = messages->executeInstructions(false, log); result = messages->executeInstructions(log, logFileLoaded);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str()); logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str());
else if (log.tellp() > 0) else if (log.tellp() > 0)
@@ -902,7 +913,7 @@ int main(int argc, char* argv[])
} }
unsigned char address = master[1]; unsigned char address = master[1];
string file; string file;
res = loadScanConfigFile(s_messageMap, address, slave, file); res = loadScanConfigFile(s_messageMap, address, slave, file, true);
if (res==RESULT_OK) if (res==RESULT_OK)
logInfo(lf_main, "scan config %2.2x: file %s loaded", address, file.c_str()); logInfo(lf_main, "scan config %2.2x: file %s loaded", address, file.c_str());
} }
src/ebusd/main.h
+4 -3
View File
@@ -43,8 +43,8 @@ struct options
int acquireTimeout; //!< bus acquisition timeout in us [9400] int acquireTimeout; //!< bus acquisition timeout in us [9400]
int acquireRetries; //!< number of retries for bus acquisition [3] int acquireRetries; //!< number of retries for bus acquisition [3]
int sendRetries; //!< number of retries for failed sends [2] int sendRetries; //!< number of retries for failed sends [2]
int receiveTimeout; //!< timeout for receiving answer from slave in us [15000] int receiveTimeout; //!< timeout for receiving answer from slave in us [25000]
int masterCount; //!< expected number of masters for arbitration [5] int masterCount; //!< expected number of masters for arbitration [0]
bool generateSyn; //!< enable AUTO-SYN symbol generation bool generateSyn; //!< enable AUTO-SYN symbol generation
bool foreground; //!< run in foreground bool foreground; //!< run in foreground
@@ -85,8 +85,9 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose=false, bool denyRecu
* @param address the address of the scan participant (either master for broadcast master data or slave for read slave data). * @param address the address of the scan participant (either master for broadcast master data or slave for read slave data).
* @param data the scan @a SymbolString for which to load the configuration file. * @param data the scan @a SymbolString for which to load the configuration file.
* @param relativeFile the string in which the name of the configuration file is stored on success. * @param relativeFile the string in which the name of the configuration file is stored on success.
* @param verbose whether to verbosely log problems.
* @return the result code. * @return the result code.
*/ */
result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolString& data, string& relativeFile); result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolString& data, string& relativeFile, bool verbose=false);
#endif // MAIN_H_ #endif // MAIN_H_