rt-tests: rt-utils: Close trace fds
cover rt-tests: rt-utils: Close trace fds
Hi John,
while using cyclictest with tracing (-b, --tracemark), I've noticed some minor issues...
Thanks,
Kurt
Kurt Kanzenbach (4):
rt-tests: rt-utils: Mark internal functions static
rt-tests: rt-utils: Add function to close trace fds
rt-tests: cyclictest: Close correct trace fds
rt-tests: oslat: Close trace fds
src/cyclictest/cyclictest.c | 8 +------- src/include/rt-utils.h | 1 + src/lib/rt-utils.c | 20 +++++++++++++++++--- src/oslat/oslat.c | 2 ++ 4 files changed, 21 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/4 rt-tests: rt-utils: Mark internal functions static
There are some helper functions which shouldn't be exported. Mark them static.
--- src/lib/rt-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
src/lib/rt-utils.c +3 -3
@@ -362,7 +362,7 @@ int parse_time_string(char *val)return t; } -void open_tracemark_fd (void ) +static void open_tracemark_fd (void ) {char path[MAX_PATH ];
@@ -390,7 +390,7 @@ void open_tracemark_fd(void) } } -int trace_file_exists (char *name) +static int trace_file_exists (char *name) {struct stat sbuf;char *tracing_prefix =get_debugfileprefix ();
@@ -399,7 +399,7 @@ int trace_file_exists(char *name)return stat (path, &sbuf) ?0 :1 ; } -void debugfs_prepare (void ) +static void debugfs_prepare (void ) {if (mount_debugfs (NULL ))fatal ("could not mount debugfs" );
Signature · 1 line
2.26.2
Re: [PATCH 1/4] rt-tests: rt-utils: Mark internal functions static
Quoted 42 lines · Kurt Kanzenbach
There are some helper functions which shouldn't be exported. Mark them static.
Signed-off-by Kurt Kanzenbach <[email protected]>--- src/lib/rt-utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)src/lib/rt-utils.c +3
-3@@ -362,7 +362,7 @@ int parse_time_string(char *val)return t; } -void open_tracemark_fd (void ) +static void open_tracemark_fd (void ) {char path[MAX_PATH ];@@ -390,7 +390,7 @@ void open_tracemark_fd(void) } } -int trace_file_exists (char *name) +static int trace_file_exists (char *name) {struct stat sbuf;char *tracing_prefix =get_debugfileprefix ();@@ -399,7 +399,7 @@ int trace_file_exists(char *name)return stat (path, &sbuf) ?0 :1 ; } -void debugfs_prepare (void ) +static void debugfs_prepare (void ) {if (mount_debugfs (NULL ))fatal ("could not mount debugfs" );Signature · 1 line
2.26.2
PATCH 2/4 rt-tests: rt-utils: Add function to close trace fds
In reply to Kurt KanzenbachCurrently the trace fds are not closed. Add a function for it.
--- src/include/rt-utils.h | 1 + src/lib/rt-utils.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
src/include/rt-utils.h +1 -0
@@ -31,6 +31,7 @@ int parse_time_string(char *val);void enable_trace_mark (void );void tracemark (char *fmt, ...) __attribute__((format (printf,1 ,2 ))); +void disable_trace_mark (void );#define MSEC_PER_SEC 1000#define USEC_PER_SEC 1000000
src/lib/rt-utils.c +14 -0
@@ -390,6 +390,15 @@ static void open_tracemark_fd(void) } } +static void close_tracemark_fd (void ) +{ +if (tracemark_fd >0 ) +close (tracemark_fd); + +if (trace_fd >0 ) +close (trace_fd); +} +static int trace_file_exists (char *name) {struct stat sbuf;
@@ -437,3 +446,8 @@ void enable_trace_mark(void)debugfs_prepare ();open_tracemark_fd (); } + +void disable_trace_mark (void ) +{ +close_tracemark_fd (); +}
Signature · 1 line
2.26.2
Re: [PATCH 2/4] rt-tests: rt-utils: Add function to close trace fds
Quoted 53 lines · Kurt Kanzenbach
Currently the trace fds are not closed. Add a function for it.
Signed-off-by Kurt Kanzenbach <[email protected]>--- src/include/rt-utils.h | 1 + src/lib/rt-utils.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)src/include/rt-utils.h +1
-0@@ -31,6 +31,7 @@ int parse_time_string(char *val);void enable_trace_mark (void );void tracemark (char *fmt, ...) __attribute__((format (printf,1 ,2 ))); +void disable_trace_mark (void );#define MSEC_PER_SEC 1000#define USEC_PER_SEC 1000000src/lib/rt-utils.c +14
-0@@ -390,6 +390,15 @@ static void open_tracemark_fd(void) } } +static void close_tracemark_fd (void ) +{ +if (tracemark_fd >0 ) +close (tracemark_fd); + +if (trace_fd >0 ) +close (trace_fd); +} +static int trace_file_exists (char *name) {struct stat sbuf;@@ -437,3 +446,8 @@ void enable_trace_mark(void)debugfs_prepare ();open_tracemark_fd (); } + +void disable_trace_mark (void ) +{ +close_tracemark_fd (); +}Signature · 1 line
2.26.2
PATCH 3/4 rt-tests: cyclictest: Close correct trace fds
In reply to Kurt KanzenbachRemove the last lefotovers from migrating cyclictest to rt-utils.
The rt-utils module is reponsible for handling the tracing code.
--- src/cyclictest/cyclictest.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
src/cyclictest/cyclictest.c +1 -7
@@ -283,9 +283,6 @@ enum { ERROR_NOTFOUND = -2, }; -static int trace_fd =-1 ; -static int tracemark_fd =-1 ; -/* * Raise the soft priority limit up to prio, if that is less than or equal * to the hard limit
@@ -2272,10 +2269,7 @@ int main(int argc, char **argv) } out:/* close any tracer file descriptors */ -if (tracemark_fd >=0 ) -close (tracemark_fd); -if (trace_fd >=0 ) -close (trace_fd); +disable_trace_mark ();/* unlock everything */ if (lockall)
Signature · 1 line
2.26.2
Re: [PATCH 3/4] rt-tests: cyclictest: Close correct trace fds
Quoted 39 lines · Kurt Kanzenbach
Remove the last lefotovers from migrating cyclictest to rt-utils.
The rt-utils module is reponsible for handling the tracing code.
Signed-off-by Kurt Kanzenbach <[email protected]>--- src/cyclictest/cyclictest.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)src/cyclictest/cyclictest.c +1
-7@@ -283,9 +283,6 @@ enum { ERROR_NOTFOUND = -2, }; -static int trace_fd =-1 ; -static int tracemark_fd =-1 ; -/* * Raise the soft priority limit up to prio, if that is less than or equal * to the hard limit @@ -2272,10 +2269,7 @@ int main(int argc, char **argv) } out:/* close any tracer file descriptors */ -if (tracemark_fd >=0 ) -close (tracemark_fd); -if (trace_fd >=0 ) -close (trace_fd); +disable_trace_mark ();/* unlock everything */ if (lockall)Signature · 1 line
2.26.2
PATCH 4/4 rt-tests: oslat: Close trace fds
In reply to Kurt Kanzenbachoslat is also using enable_trace_mark() and never closes the fds. Add it.
--- src/oslat/oslat.c | 2 ++ 1 file changed, 2 insertions(+)
src/oslat/oslat.c +2 -0
@@ -871,5 +871,7 @@ int main(int argc, char *argv[]) g.cpu_list =NULL ; } +disable_trace_mark (); +return 0 ; }
Signature · 1 line
2.26.2
Re: [PATCH 4/4] rt-tests: oslat: Close trace fds
Quoted 23 lines · Kurt Kanzenbach
oslat is also using
enable_trace_mark()and never closes the fds. Add it.Signed-off-by Kurt Kanzenbach <[email protected]>--- src/oslat/oslat.c | 2 ++ 1 file changed, 2 insertions(+)src/oslat/oslat.c +2
-0@@ -871,5 +871,7 @@ int main(int argc, char *argv[]) g.cpu_list =NULL ; } +disable_trace_mark (); +return 0 ; }Signature · 1 line
2.26.2