-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate pigweed tokenizer logging (#15039)
* Integrate pigweed tokenizer for logging *add pw_tokenizer build changes. *add build changes in nxp k32w lighting-app. *update nxp k32w lighting-app README. *change logging functions to use the tokenizer. *guard tokenizer changes with define. *split logs where too many arguments. *create build test for k32w lighting-app with tokenizer. *update .wordlist.txt and remove duplicates. Signed-off-by: Andrei Menzopol <[email protected]> * Fix misspell docs/VSCODE_DEVELOPMENT.md. Signed-off-by: Andrei Menzopol <[email protected]>
- Loading branch information
1 parent
fa47d9d
commit 3560708
Showing
19 changed files
with
371 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| import argparse | ||
| import sys | ||
| import os | ||
| import serial | ||
| import pw_tokenizer | ||
|
|
||
|
|
||
| def parse_args(): | ||
| """Parse input arguments | ||
| Return: | ||
| parsed arguments struncture | ||
| """ | ||
|
|
||
| parser = argparse.ArgumentParser() | ||
| subparsers = parser.add_subparsers(dest='type') | ||
| subparsers.required = True | ||
|
|
||
| parser_file = subparsers.add_parser('file') | ||
| parser_file.add_argument( | ||
| "-i", "--input", help="Input file name.", required=True) | ||
| parser_file.add_argument( | ||
| "-d", "--database", help="Token database.", required=True) | ||
| parser_file.add_argument( | ||
| "-o", "--output", help="Output file name.", required=True) | ||
|
|
||
| parser_file = subparsers.add_parser('serial') | ||
| parser_file.add_argument( | ||
| "-i", "--input", help="Input serial port name.", required=True) | ||
| parser_file.add_argument( | ||
| "-d", "--database", help="Token database.", required=True) | ||
| parser_file.add_argument( | ||
| "-o", "--output", help="Output file name. Write to stdout and to file.") | ||
|
|
||
| return parser.parse_args() | ||
|
|
||
|
|
||
| def decode_string(tstr, detok): | ||
| """Decodes a single token. | ||
| Args: | ||
| tstr - encoded input string | ||
| detok - detokenizer | ||
| Return: | ||
| decoded string or None | ||
| """ | ||
| try: | ||
| t = bytes.fromhex(tstr) | ||
| s = str(detok.detokenize(t)) | ||
|
|
||
| if s.find('$') == 0: | ||
| return None | ||
| return s | ||
| except: | ||
| return None | ||
|
|
||
|
|
||
| def decode_serial(serialport, outfile, database): | ||
| """Decodes logs from serial port. | ||
| Args: | ||
| infile - path to input file | ||
| outfile - path to output file | ||
| database - path to token database | ||
| """ | ||
|
|
||
| detokenizer = pw_tokenizer.Detokenizer(database) | ||
| input = serial.Serial(serialport, 115200, timeout=None) | ||
|
|
||
| output = None | ||
| if outfile: | ||
| output = open(outfile, 'w') | ||
|
|
||
| if input: | ||
|
|
||
| try: | ||
| while(True): | ||
| if(input.in_waiting > 0): | ||
| # read line from serial port and ascii decode | ||
| line = input.readline().decode('ascii').strip() | ||
| # find token start and detokenize | ||
| idx = line.rfind(']') | ||
| dstr = decode_string(line[idx + 1:], detokenizer) | ||
| if dstr: | ||
| line = line[:idx+1] + dstr | ||
| print(line, file=sys.stdout) | ||
| if output: | ||
| print(line, file=output) | ||
| except: | ||
| print("Serial error or program closed", file=sys.stderr) | ||
|
|
||
| if output: | ||
| input.close() | ||
| output.close() | ||
|
|
||
| else: | ||
| print("Invalid or closed serial port.", file=sys.stderr) | ||
|
|
||
|
|
||
| def decode_file(infile, outfile, database): | ||
| """Decodes logs from input file. | ||
| Args: | ||
| infile - path to input file | ||
| outfile - path to output file | ||
| database - path to token database | ||
| """ | ||
|
|
||
| if os.path.isfile(infile): | ||
|
|
||
| detokenizer = pw_tokenizer.Detokenizer(database) | ||
|
|
||
| output = open(outfile, 'w') | ||
|
|
||
| with open(infile, 'rb') as file: | ||
| for line in file: | ||
| try: | ||
| # ascii decode line | ||
| # serial terminals may include non ascii characters | ||
| line = line.decode('ascii').strip() | ||
| except: | ||
| continue | ||
| # find token start and detokenize | ||
| idx = line.rfind(']') | ||
| dstr = decode_string(line[idx + 1:], detokenizer) | ||
| if dstr: | ||
| line = line[:idx+1] + dstr | ||
| print(line, file=output) | ||
| output.close() | ||
|
|
||
| else: | ||
| print("File does not exist or is not a file.", file=sys.stderr) | ||
|
|
||
|
|
||
| def detokenize_input(): | ||
|
|
||
| args = parse_args() | ||
|
|
||
| if args.type == 'file': | ||
| decode_file(args.input, args.output, args.database) | ||
| if args.type == 'serial': | ||
| decode_serial(args.input, args.output, args.database) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| detokenize_input() | ||
| sys.exit(0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.