interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: interesting:riscv
Branches Tags
interesting:riscv
interesting:examine_unavailable_harts_rebase
interesting:examine_unavailable_harts_squash
interesting:examine_unavailable_harts
interesting:examine_unavailable_harts_backup
interesting:reset_test
interesting:us_xds110
interesting:hypervisor_translate
interesting:dsp5680_build
interesting:examine_command
interesting:halt_examine
interesting:gd32vf103
interesting:set_group
interesting:macro
interesting:s2_increment
interesting:jlink
interesting:buf_sget
interesting:static
interesting:global
interesting:dmstatus_version
interesting:manual_hwbp
interesting:regcache
interesting:vector2
interesting:busy
interesting:mem64
interesting:bscan_optimization
interesting:debug-log-reg-failure
interesting:reverse-resume-order
interesting:new_bscan_approach
interesting:bscan_tunnel
interesting:log_output
interesting:haltreq
interesting:deinit
interesting:eclipse_memory_read
interesting:old_fixes_and_eclipse_memory_read
interesting:mpsse_flush
interesting:sba_tests
interesting:riscv-compliance
interesting:wip
interesting:riscv-compliance-dev
interesting:compliance_dev
interesting:fence_i_fix_for_release
interesting:rbb_cleanup
interesting:dmi_read
interesting:add_macos_build
interesting:fix_macbuild
interesting:update_defines
interesting:macbuild
interesting:winbuild
interesting:eclipse_multicore_fix
interesting:FE_402_fix
interesting:gdb_next_port
interesting:print_port
interesting:build32
interesting:travis-nop
interesting:old_triggers
interesting:master
interesting:autoconf
interesting:gitignore-build
interesting:multicore
interesting:release
interesting:race
interesting:nohartstatus
interesting:newprogram
interesting:__archive__
interesting:latest
interesting:openocd64-ad4c3e1
interesting:openocd64-8b80fe1
interesting:openocd64-41b9c69e92d9660cb2eff508f3bc8218a3b3e461
interesting:openocd64-d486b21
interesting:v2018.12.0
interesting:v20181030
interesting:v20180928
interesting:v20180629
interesting:v20171231
interesting:v20170818
interesting:v20170621
interesting:v20170612
interesting:v20170608
...
pull from: interesting:log_output
Branches Tags
interesting:riscv
interesting:examine_unavailable_harts_rebase
interesting:examine_unavailable_harts_squash
interesting:examine_unavailable_harts
interesting:examine_unavailable_harts_backup
interesting:reset_test
interesting:us_xds110
interesting:hypervisor_translate
interesting:dsp5680_build
interesting:examine_command
interesting:halt_examine
interesting:gd32vf103
interesting:set_group
interesting:macro
interesting:s2_increment
interesting:jlink
interesting:buf_sget
interesting:static
interesting:global
interesting:dmstatus_version
interesting:manual_hwbp
interesting:regcache
interesting:vector2
interesting:busy
interesting:mem64
interesting:bscan_optimization
interesting:debug-log-reg-failure
interesting:reverse-resume-order
interesting:new_bscan_approach
interesting:bscan_tunnel
interesting:log_output
interesting:haltreq
interesting:deinit
interesting:eclipse_memory_read
interesting:old_fixes_and_eclipse_memory_read
interesting:mpsse_flush
interesting:sba_tests
interesting:riscv-compliance
interesting:wip
interesting:riscv-compliance-dev
interesting:compliance_dev
interesting:fence_i_fix_for_release
interesting:rbb_cleanup
interesting:dmi_read
interesting:add_macos_build
interesting:fix_macbuild
interesting:update_defines
interesting:macbuild
interesting:winbuild
interesting:eclipse_multicore_fix
interesting:FE_402_fix
interesting:gdb_next_port
interesting:print_port
interesting:build32
interesting:travis-nop
interesting:old_triggers
interesting:master
interesting:autoconf
interesting:gitignore-build
interesting:multicore
interesting:release
interesting:race
interesting:nohartstatus
interesting:newprogram
interesting:__archive__
interesting:latest
interesting:openocd64-ad4c3e1
interesting:openocd64-8b80fe1
interesting:openocd64-41b9c69e92d9660cb2eff508f3bc8218a3b3e461
interesting:openocd64-d486b21
interesting:v2018.12.0
interesting:v20181030
interesting:v20180928
interesting:v20180629
interesting:v20171231
interesting:v20170818
interesting:v20170621
interesting:v20170612
interesting:v20170608

3 Commits
riscv ... log_output

Author SHA1 Message Date
Tim Newsome 6325701062 Follow OpenOCD style guide. 
Change-Id: I1105c9d570890423f2712919bdaba26fdd09acab
 2019-02-21 12:45:25 -08:00
Tim Newsome 7072f92513 Document log_output >stdout and >stderr. 
Change-Id: I29631d9a6058fffff4d3a5b35329cc6a56ec1eea
 2019-02-21 12:45:09 -08:00
Tim Newsome ae25286c87 Add >stdout and >stderr to log_output command. 
This allows people to send log output to stdout and stderr in addition
to a file.

Change-Id: I4b3f575b416c425b1e61b39e422262bf68f41091
 2019-02-21 12:09:45 -08:00
2 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

5
doc/openocd.texi
View File

@ -7702,8 +7702,9 @@ echo "Downloading kernel -- please wait"
@end deffn
@deffn Command log_output [filename]
Redirect logging to @var{filename};
the initial log output channel is stderr.
Redirect logging to @var{filename}. If @var{filename} is >stdout or >stderr,
then logging is redirected to stdout and stderr respectively.
The initial log output channel is stderr.
@end deffn
@deffn Command add_script_search_dir [directory]

16
src/helper/log.c
View File

@ -221,12 +221,18 @@ COMMAND_HANDLER(handle_debug_level_command)
COMMAND_HANDLER(handle_log_output_command)
{
if (CMD_ARGC == 1) {
FILE *file = fopen(CMD_ARGV[0], "w");
FILE *file = NULL;
if (!strcmp(CMD_ARGV[0], ">stdout"))
file = stdout;
else if (!strcmp(CMD_ARGV[0], ">stderr"))
file = stderr;
else
file = fopen(CMD_ARGV[0], "w");
if (file == NULL) {
LOG_ERROR("failed to open output log '%s'", CMD_ARGV[0]);
return ERROR_FAIL;
}
if (log_output != stderr && log_output != NULL) {
if (log_output != stdout && log_output != stderr && log_output != NULL) {
/* Close previous log file, if it was open and wasn't stderr. */
fclose(log_output);
}
@ -285,12 +291,6 @@ void log_init(void)
start = last_time = timeval_ms();
}
int set_log_output(struct command_context *cmd_ctx, FILE *output)
{
log_output = output;
return ERROR_OK;
}
/* add/remove log callback handler */
int log_add_callback(log_callback_fn fn, void *priv)
{