Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-24 17:48:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: small fixes to cpu affinity

Browse Source 
- Do not mention x:y form in the comment since it's not supported
  - Give more detail in the help output regarding the meaning of each form
  - No prints in the helper parse function, let the caller print it
This commit is contained in:
Lucas De Marchi 2021-10-08 13:40:49 -07:00 committed by Willian Galvani
parent 44efff30e2
commit 78d2b0a61d
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
View File

@ -296,8 +296,9 @@ void _usage(void)
printf("\t --module-directory %s\n", AP_MODULE_DEFAULT_DIRECTORY); printf("\t --module-directory %s\n", AP_MODULE_DEFAULT_DIRECTORY);
printf("\t -M %s\n", AP_MODULE_DEFAULT_DIRECTORY); printf("\t -M %s\n", AP_MODULE_DEFAULT_DIRECTORY);
#endif #endif
printf("\tcpu affinity --cpu-affinity 0,3 or 0,3\n"); printf("\tcpu affinity:\n");
printf("\t -c 0,3 or range -c 1,3\n"); printf("\t --cpu-affinity 1 (single cpu) or 1,3 (multiple cpus) or 1-3 (range of cpus)\n");
printf("\t -c 1 (single cpu) or 1,3 (multiple cpus) or 1-3 (range of cpus)\n");
} }
void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const
@ -305,7 +306,7 @@ void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const
#if AP_MODULE_SUPPORTED #if AP_MODULE_SUPPORTED
const char *module_path = AP_MODULE_DEFAULT_DIRECTORY; const char *module_path = AP_MODULE_DEFAULT_DIRECTORY;
#endif #endif
int opt; int opt;
const struct GetOptLong::option options[] = { const struct GetOptLong::option options[] = {
{"uartA", true, 0, 'A'}, {"uartA", true, 0, 'A'},
@ -382,6 +383,7 @@ void HAL_Linux::run(int argc, char* const argv[], Callbacks* callbacks) const
case 'c': case 'c':
cpu_set_t cpu_affinity; cpu_set_t cpu_affinity;
if (!utilInstance.parse_cpu_set(gopt.optarg, &cpu_affinity)) { if (!utilInstance.parse_cpu_set(gopt.optarg, &cpu_affinity)) {
fprintf(stderr, "Could not parse cpu affinity: %s\n", gopt.optarg);
exit(1); exit(1);
} }
Linux::Scheduler::from(scheduler)->set_cpu_affinity(cpu_affinity); Linux::Scheduler::from(scheduler)->set_cpu_affinity(cpu_affinity);

3
libraries/AP_HAL_Linux/Util.cpp
View File

@ -298,7 +298,6 @@ bool Util::parse_cpu_set(const char *str, cpu_set_t *cpu_set) const
do { do {
cpu1 = strtoul(str, &endptr, 10); cpu1 = strtoul(str, &endptr, 10);
if (str == endptr) { if (str == endptr) {
fprintf(stderr, "Invalid option for cpu-affinity: %s missing cpu number\n", str);
return false; return false;
} }
@ -310,13 +309,11 @@ bool Util::parse_cpu_set(const char *str, cpu_set_t *cpu_set) const
} }
if (sep != '-') { if (sep != '-') {
fprintf(stderr, "Invalid option for cpu-affinity: %s did you means separator - e.g. 1-3\n", str);
return false; return false;
} }
cpu2 = strtoul(str, &endptr, 10); cpu2 = strtoul(str, &endptr, 10);
if (str == endptr) { if (str == endptr) {
fprintf(stderr, "Invalid option for cpu-affinity: %s missing end cpu number\n", str);
return false; return false;
} }

2
libraries/AP_HAL_Linux/Util.h
View File

@ -58,7 +58,7 @@ public:
return custom_defaults; return custom_defaults;
} }
/* Parse cpu set in the form 0,2 or 0-2 or 0:2*/ /* Parse cpu set in the form 0; 0,2; or 0-2 */
bool parse_cpu_set(const char *s, cpu_set_t *cpu_set) const; bool parse_cpu_set(const char *s, cpu_set_t *cpu_set) const;
bool is_chardev_node(const char *path); bool is_chardev_node(const char *path);