From ebedbbbfb5ba84ac8591220e6f8387750575693b Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 9 Jun 2023 22:51:54 -0500 Subject: [PATCH] Clean up debug a bit --- include/hamlib/rig.h | 4 ++-- src/misc.h | 4 ++-- tests/rigctld.c | 5 ----- tests/rigctltcp.c | 5 ----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 986321d76..690e7b719 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -29,7 +29,7 @@ // Our shared secret password #define HAMLIB_SECRET_LENGTH 32 -#define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%s(%d) trace\n", __FILE__, __LINE__) +#define HAMLIB_TRACE rig_debug(RIG_DEBUG_TRACE,"%.*s%s(%d) trace\n",rig->state.depth-1, spaces(), __FILE__, __LINE__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) #include @@ -3552,7 +3552,7 @@ extern HAMLIB_EXPORT_VAR(char) debugmsgsave3[DEBUGMSGSAVE_SIZE]; // last-2 debu // Measuring elapsed time -- local variable inside function when macro is used #define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET); -#define ELAPSED2 rig_debug(RIG_DEBUG_TRACE, "%.*s%d:%s: elapsed=%.0lfms\n", rig->state.depth, spaces(), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET)); +#define ELAPSED2 rig_debug(RIG_DEBUG_TRACE, "%.*s%d:%s: elapsed=%.0lfms\n", rig->state.depth-1, spaces(), rig->state.depth, __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET)); // use this instead of snprintf for automatic detection of buffer limit #define SNPRINTF(s,n,...) { snprintf(s,n,##__VA_ARGS__);if (strlen(s) > n-1) fprintf(stderr,"****** %s(%d): buffer overflow ******\n", __func__, __LINE__); } diff --git a/src/misc.h b/src/misc.h index 66cdd7faf..fac999786 100644 --- a/src/misc.h +++ b/src/misc.h @@ -158,7 +158,7 @@ extern HAMLIB_EXPORT(char *)date_strget(char *buf, int buflen, int localtime); void errmsg(int err, char *s, const char *func, const char *file, int line); #define ERRMSG(err, s) errmsg(err, s, __func__, __FILENAME__, __LINE__) #define ENTERFUNC { ++rig->state.depth; \ - rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s entered\n", rig->state.depth, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__); \ + rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s entered\n", rig->state.depth-1, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__); \ } #define ENTERFUNC2 { rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s entered\n", __FILENAME__, __LINE__, __func__); \ } @@ -166,7 +166,7 @@ void errmsg(int err, char *s, const char *func, const char *file, int line); // could be a function call #define RETURNFUNC(rc) {do { \ int rctmp = rc; \ - rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s returning(%ld) %s\n", rig->state.depth, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__, (long int) (rctmp), rctmp<0?rigerror2(rctmp):""); \ + rig_debug(RIG_DEBUG_VERBOSE, "%.*s%d:%s(%d):%s returning(%ld) %s\n", rig->state.depth-1, spaces(), rig->state.depth, __FILENAME__, __LINE__, __func__, (long int) (rctmp), rctmp<0?rigerror2(rctmp):""); \ if (rig->state.depth == 0) rig_debug(RIG_DEBUG_ERR, "%s(%d) depth=0 ******************\n", __func__, __LINE__); \ --rig->state.depth; \ return (rctmp); \ diff --git a/tests/rigctld.c b/tests/rigctld.c index bd0ad1b6b..7e18ce837 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -1117,7 +1117,6 @@ int main(int argc, char *argv[]) #ifdef HAVE_PTHREAD /* allow threads to finish current action */ mutex_rigctld(1); - HAMLIB_TRACE; if (client_count) { @@ -1125,17 +1124,13 @@ int main(int argc, char *argv[]) } rig_close(my_rig); - HAMLIB_TRACE; mutex_rigctld(0); - HAMLIB_TRACE; #else rig_close(my_rig); /* close port */ #endif - HAMLIB_TRACE; network_multicast_publisher_stop(my_rig); - HAMLIB_TRACE; rig_cleanup(my_rig); /* if you care about memory */ #ifdef __MINGW32__ diff --git a/tests/rigctltcp.c b/tests/rigctltcp.c index 56e612123..f80cfe906 100644 --- a/tests/rigctltcp.c +++ b/tests/rigctltcp.c @@ -1103,7 +1103,6 @@ int main(int argc, char *argv[]) #ifdef HAVE_PTHREAD /* allow threads to finish current action */ mutex_rigctld(1); - HAMLIB_TRACE; if (client_count) { @@ -1111,17 +1110,13 @@ int main(int argc, char *argv[]) } rig_close(my_rig); - HAMLIB_TRACE; mutex_rigctld(0); - HAMLIB_TRACE; #else rig_close(my_rig); /* close port */ #endif - HAMLIB_TRACE; network_multicast_publisher_stop(my_rig); - HAMLIB_TRACE; rig_cleanup(my_rig); /* if you care about memory */ #ifdef __MINGW32__