[v6,28/45] trace-cmd library: Reuse within the library the function that checks file state.

Message ID	20210614075029.598048-29-tz.stoyanov@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-trace-devel-owner@kernel.org> From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v6 28/45] trace-cmd library: Reuse within the library the function that checks file state. Date: Mon, 14 Jun 2021 10:50:12 +0300 Message-Id: <20210614075029.598048-29-tz.stoyanov@gmail.com> In-Reply-To: <20210614075029.598048-1-tz.stoyanov@gmail.com> References: <20210614075029.598048-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add trace file compression \| expand [v6,00/45] Add trace file compression [v6,01/45] trace-cmd library: Remove unused private APIs for creating trace files [v6,02/45] trace-cmd library: Remove unused API tracecmd_update_option [v6,03/45] trace-cmd: Check if file version is supported [v6,04/45] trace-cmd library: Add new API to get file version of input handler [v6,05/45] trace-cmd library: Select the file version when writing trace file [v6,06/45] trace-cmd: Add APIs for library initialization and free [v6,07/45] trace-cmd library: Add support for compression algorithms [v6,08/45] trace-cmd list: Show supported compression algorithms [v6,09/45] trace-cmd library: Bump the trace file version to 7 [v6,10/45] trace-cmd library: Compress part of the trace file [v6,11/45] trace-cmd library: Read compressed trace file [v6,12/45] trace-cmd library: Add new API to get compression of input handler [v6,13/45] trace-cmd library: Inherit compression algorithm from input file [v6,14/45] trace-cmd library: Extend the create file APIs to support different compression [v6,15/45] trace-cmd record: Add new parameter --compression [v6,16/45] trace-cmd dump: Add support for trace files version 7 [v6,17/45] trace-cmd library: Add support for zlib compression library [v6,18/45] trace-cmd library: Hide the logic for updating buffer offset [v6,19/45] trace-cmd: Move buffers description outside of options [v6,20/45] trace-cmd library: Track the offset in the option section in the trace file [v6,21/45] trace-cmd library: Add compression of the option section of the trace file [v6,22/45] trace-cmd library: Refactor the logic for writing trace data in the file [v6,23/45] trace-cmd library: Add APIs for read and write compressed data in chunks [v6,24/45] trace-cmd: Compress trace data [v6,25/45] trace-cmd: Read compressed trace data [v6,26/45] trace-cmd library: Compress latency trace data [v6,27/45] trace-cmd: Read compressed latency trace data [v6,28/45] trace-cmd library: Reuse within the library the function that checks file state. [v6,29/45] trace-cmd library: Make tracecmd_copy_headers() to work with output handler [v6,30/45] trace-cmd: Do not use trace file compression with streams [v6,31/45] trace-cmd library: Add new API to get file version of output handler [v6,32/45] trace-cmd: Add file state parameter to tracecmd_copy [v6,33/45] trace-cmd: Copy CPU count in tracecmd_copy [v6,34/45] trace-cmd: Copy buffers description in tracecmd_copy [v6,35/45] trace-cmd: Copy options in tracecmd_copy [v6,36/45] trace-cmd library: Refactor the logic for writing CPU trace data [v6,37/45] trace-cmd library: Refactor the logic for writing CPU instance trace data [v6,38/45] trace-cmd: Copy trace data in tracecmd_copy [v6,39/45] trace-cmd: Add compression parameter to tracecmd_copy [v6,40/45] trace-cmd: Add new command "trace-cmd convert" [v6,41/45] trace-cmd record: Update man page [v6,42/45] trace-cmd: Add convert man page [v6,43/45] trace-cmd: Update bash completion [v6,44/45] trace-cmd list: Update the man page [v6,45/45] trace-cmd: Update trace.dat man page

diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h index 03d2a9a3..d44b58a9 100644 --- a/lib/trace-cmd/include/trace-cmd-local.h +++ b/lib/trace-cmd/include/trace-cmd-local.h @@ -39,6 +39,10 @@ void tracecmd_zlib_free(void); void tracecmd_compress_init(void); void tracecmd_compress_free(void); +bool check_file_state(unsigned long file_version, int current_state, int new_state); +bool check_in_state(struct tracecmd_input *handle, int new_state); +bool check_out_state(struct tracecmd_output *handle, int new_state); + int out_uncompress_block(struct tracecmd_output *handle); int out_compression_start(struct tracecmd_output *handle); int out_compression_end(struct tracecmd_output *handle); diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index 12876838..d3c5ad18 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -4436,3 +4436,8 @@ int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable) return 0; } + +__hidden bool check_in_state(struct tracecmd_input *handle, int new_state) +{ + return check_file_state(handle->file_version, handle->file_state, new_state); +} diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c index 017b3d7d..c41dfb8f 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -419,50 +419,6 @@ int tracecmd_ftrace_enable(int set) return ret; } -static int check_out_state(struct tracecmd_output *handle, int new_state) -{ - if (!handle) - return -1; - - if (handle->file_version < 7) { - switch (new_state) { - case TRACECMD_FILE_BUFERS: - tracecmd_warning("State %d is not supported in trace file version %d", - new_state, handle->file_version); - return -1; - default: - break; - } - } - - switch (new_state) { - case TRACECMD_FILE_HEADERS: - case TRACECMD_FILE_FTRACE_EVENTS: - case TRACECMD_FILE_ALL_EVENTS: - case TRACECMD_FILE_KALLSYMS: - case TRACECMD_FILE_PRINTK: - case TRACECMD_FILE_CMD_LINES: - case TRACECMD_FILE_CPU_COUNT: - case TRACECMD_FILE_BUFERS: - if (handle->file_state == (new_state - 1)) - return 0; - break; - case TRACECMD_FILE_OPTIONS: - if (handle->file_version < 7 && handle->file_state == TRACECMD_FILE_CPU_COUNT) - return 0; - if (handle->file_version >= 7 && handle->file_state == TRACECMD_FILE_BUFERS) - return 0; - break; - case TRACECMD_FILE_CPU_LATENCY: - case TRACECMD_FILE_CPU_FLYRECORD: - if (handle->file_state == TRACECMD_FILE_OPTIONS) - return 0; - break; - } - - return -1; -} - static int read_header_files(struct tracecmd_output *handle) { tsize_t size, check_size, endian8; @@ -471,7 +427,7 @@ static int read_header_files(struct tracecmd_output *handle) int fd; int ret; - if (check_out_state(handle, TRACECMD_FILE_HEADERS) < 0) { + if (!check_out_state(handle, TRACECMD_FILE_HEADERS)) { tracecmd_warning("Cannot read header files, unexpected state 0x%X", handle->file_state); return -1; @@ -783,7 +739,7 @@ static int read_ftrace_files(struct tracecmd_output *handle) struct tracecmd_event_list list = { .glob = "ftrace/*" }; int ret; - if (check_out_state(handle, TRACECMD_FILE_FTRACE_EVENTS) < 0) { + if (!check_out_state(handle, TRACECMD_FILE_FTRACE_EVENTS)) { tracecmd_warning("Cannot read ftrace files, unexpected state 0x%X", handle->file_state); return -1; @@ -828,7 +784,7 @@ static int read_event_files(struct tracecmd_output *handle, int endian4; int ret; - if (check_out_state(handle, TRACECMD_FILE_ALL_EVENTS) < 0) { + if (!check_out_state(handle, TRACECMD_FILE_ALL_EVENTS)) { tracecmd_warning("Cannot read event files, unexpected state 0x%X", handle->file_state); return -1; @@ -927,7 +883,7 @@ static int read_proc_kallsyms(struct tracecmd_output *handle, struct stat st; int ret; - if (check_out_state(handle, TRACECMD_FILE_KALLSYMS) < 0) { + if (!check_out_state(handle, TRACECMD_FILE_KALLSYMS)) { tracecmd_warning("Cannot read kallsyms, unexpected state 0x%X", handle->file_state); return -1; @@ -977,7 +933,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle) char *path; int ret; - if (check_out_state(handle, TRACECMD_FILE_PRINTK) < 0) { + if (!check_out_state(handle, TRACECMD_FILE_PRINTK)) { tracecmd_warning("Cannot read printk, unexpected state 0x%X", handle->file_state); return -1; @@ -1339,11 +1295,10 @@ int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus) { int ret; - ret = check_out_state(handle, TRACECMD_FILE_CPU_COUNT); - if (ret < 0) { + if (!check_out_state(handle, TRACECMD_FILE_CPU_COUNT)) { tracecmd_warning("Cannot write CPU count into the file, unexpected state 0x%X", handle->file_state); - return ret; + return -1; } cpus = convert_endian_4(handle, cpus); ret = do_write_check(handle, &cpus, 4); @@ -1359,16 +1314,14 @@ int tracecmd_write_options(struct tracecmd_output *handle) unsigned short option; unsigned short endian2; unsigned int endian4; - int ret; /* If already written, ignore */ if (handle->file_state == TRACECMD_FILE_OPTIONS) return 0; - ret = check_out_state(handle, TRACECMD_FILE_OPTIONS); - if (ret < 0) { + if (!check_out_state(handle, TRACECMD_FILE_OPTIONS)) { tracecmd_warning("Cannot write options into the file, unexpected state 0x%X", handle->file_state); - return ret; + return -1; } if (do_write_check(handle, "options ", 10)) @@ -1604,11 +1557,10 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle) { int ret; - ret = check_out_state(handle, TRACECMD_FILE_CMD_LINES); - if (ret < 0) { + if (!check_out_state(handle, TRACECMD_FILE_CMD_LINES)) { tracecmd_warning("Cannot write command lines into the file, unexpected state 0x%X", handle->file_state); - return ret; + return -1; } out_compression_start(handle); @@ -1628,7 +1580,6 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in { struct tracecmd_output *handle; char *path; - int ret; handle = create_file(output_file, NULL, NULL, NULL, &all_event_list, compression); if (!handle) @@ -1647,8 +1598,7 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in if (tracecmd_write_options(handle) < 0) goto out_free; - ret = check_out_state(handle, TRACECMD_FILE_CPU_LATENCY); - if (ret < 0) { + if (!check_out_state(handle, TRACECMD_FILE_CPU_LATENCY)) { tracecmd_warning("Cannot write latency data into the file, unexpected state 0x%X", handle->file_state); goto out_free; @@ -1737,7 +1687,9 @@ int tracecmd_write_cpu_data(struct tracecmd_output *handle, /* This can be called multiple times (when recording instances) */ ret = handle->file_state == TRACECMD_FILE_CPU_FLYRECORD ? 0 : - check_out_state(handle, TRACECMD_FILE_CPU_FLYRECORD); + check_file_state(handle->file_version, + handle->file_state, + TRACECMD_FILE_CPU_FLYRECORD); if (ret < 0) { tracecmd_warning("Cannot write trace data into the file, unexpected state 0x%X", handle->file_state); @@ -2006,3 +1958,8 @@ out_free: tracecmd_output_close(handle); return NULL; } + +__hidden bool check_out_state(struct tracecmd_output *handle, int new_state) +{ + return check_file_state(handle->file_version, handle->file_state, new_state); +} diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c index 136260c6..087d37ab 100644 --- a/lib/trace-cmd/trace-util.c +++ b/lib/trace-cmd/trace-util.c @@ -636,3 +636,44 @@ void tracecmd_lib_free(void) { tracecmd_compress_free(); } + +__hidden bool check_file_state(unsigned long file_version, int current_state, int new_state) +{ + if (file_version < 7) { + switch (new_state) { + case TRACECMD_FILE_BUFERS: + tracecmd_warning("State %d is not supported in trace file version %d", + new_state, file_version); + return false; + default: + break; + } + } + + switch (new_state) { + case TRACECMD_FILE_HEADERS: + case TRACECMD_FILE_FTRACE_EVENTS: + case TRACECMD_FILE_ALL_EVENTS: + case TRACECMD_FILE_KALLSYMS: + case TRACECMD_FILE_PRINTK: + case TRACECMD_FILE_CMD_LINES: + case TRACECMD_FILE_CPU_COUNT: + case TRACECMD_FILE_BUFERS: + if (current_state == (new_state - 1)) + return true; + break; + case TRACECMD_FILE_OPTIONS: + if (file_version < 7 && current_state == TRACECMD_FILE_CPU_COUNT) + return true; + if (file_version >= 7 && current_state == TRACECMD_FILE_BUFERS) + return true; + break; + case TRACECMD_FILE_CPU_LATENCY: + case TRACECMD_FILE_CPU_FLYRECORD: + if (current_state == TRACECMD_FILE_OPTIONS) + return true; + break; + } + + return false; +}

[v6,28/45] trace-cmd library: Reuse within the library the function that checks file state.

Commit Message

Patch