X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Ftext%2FtextFilter.c;h=ca613ac6edf638e48237d48c2e1231c3a7b14b77;hb=ec7a5af61127aa50a1839eee5be99ce53494c57b;hp=08d0cc97c1855cb7e1e1d309e2cd2a69b458a2b8;hpb=73050a5ffb71a9a78b82baba0316d3416738372d;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/text/textFilter.c b/ltt/branches/poly/lttv/modules/text/textFilter.c index 08d0cc97..ca613ac6 100644 --- a/ltt/branches/poly/lttv/modules/text/textFilter.c +++ b/ltt/branches/poly/lttv/modules/text/textFilter.c @@ -1,5 +1,5 @@ /* This file is part of the Linux Trace Toolkit viewer - * Copyright (C) 2003-2004 Michel Dagenais + * Copyright (C) 2005 Simon Bouvier-Zappa * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -16,11 +16,20 @@ * MA 02111-1307, USA. */ -/* - * The text filter facility will prompt for user filter option - * and transmit them to the lttv core +/*! \file lttv/modules/text/textFilter.c + * \brief Textual prompt for user filtering expression. + * + * The text filter facility will prompt for user filter option + * and transmit them to the lttv core. User can either specify + * a filtering string with the command line or/and specify a + * file containing filtering expressions. */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include #include #include #include @@ -31,19 +40,11 @@ #include #include #include -#include #include -#include -#include /* Insert the hooks before and after each trace and tracefile, and for each event. Print a global header. */ -/* - * YET TO BE ANSWERED ! - * - why does this module need dependency with batchAnalysis ? - */ - /* * TODO * - specify wich hook function will be used to call the core filter @@ -57,17 +58,12 @@ static LttvHooks *before_traceset, *event_hook; -static FILE *a_file; - /** * filters the file input from user - * @param hook_data the hook data - * @return success/failure of operation + * @param hook_data the hook data, unused */ void filter_analyze_file(void *hook_data) { - g_print("textFilter::filter_analyze_file\n"); - LttvAttributeValue value; LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); @@ -77,42 +73,32 @@ void filter_analyze_file(void *hook_data) { * and/or command line string. From these sources, an * option string is rebuilded and sent to the filter core */ - GString* a_file_content = g_string_new(""); - a_file = fopen(a_file_name, "r"); - if(a_file == NULL) { - g_warning("file %s does not exist", a_file_name); + if(!g_file_test(a_file_name,G_FILE_TEST_EXISTS)) { + g_warning("file %s does not exist", a_file_name); return; } - - char* line = NULL; - size_t len = 0; - while(!feof(a_file)) { - len = getline(&line,&len,a_file); - g_string_append(a_file_content,line); - } - free(line); + char* a_file_content = NULL; + + g_file_get_contents(a_file_name,&a_file_content,NULL,NULL); g_assert(lttv_iattribute_find_by_path(attributes, "filter/expression", LTTV_POINTER, &value)); - g_debug("Filter file string b: %s",((GString*)*(value.v_pointer))->str); - if(((GString*)*(value.v_pointer))->len != 0) g_string_append_c((GString*)*(value.v_pointer),'&'); - g_string_append((GString*)*(value.v_pointer),a_file_content->str); - g_debug("Filter file string a: %s",((GString*)*(value.v_pointer))->str); - // lttv_filter_append_expression(lttvfilter_t,a_filter_string->str); - fclose(a_file); + if(((GString*)*(value.v_pointer))->len != 0) + g_string_append_c((GString*)*(value.v_pointer),'&'); + g_string_append_c((GString*)*(value.v_pointer),'('); + g_string_append((GString*)*(value.v_pointer),a_file_content); + g_string_append_c((GString*)*(value.v_pointer),')'); + } /** * filters the string input from user - * @param hook_data the hook data - * @return success/failure of operation + * @param hook_data the hook data, unused */ void filter_analyze_string(void *hook_data) { - g_print("textFilter::filter_analyze_string\n"); - LttvAttributeValue value; LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); @@ -122,24 +108,56 @@ void filter_analyze_string(void *hook_data) { * and/or command line string. From these sources, an * option string is rebuilded and sent to the filter core */ -/* if(a_filter_string==NULL) { - a_filter_string = g_string_new(""); - g_string_append(a_filter_string,a_string); - } - else { - g_string_append(a_filter_string,"&"); - g_string_append(a_filter_string,a_string); - } -*/ -// lttv_filter_append_expression(lttvfilter_t,a_string); g_assert(lttv_iattribute_find_by_path(attributes, "filter/expression", LTTV_POINTER, &value)); + if(((GString*)*(value.v_pointer))->len != 0) + g_string_append_c((GString*)*(value.v_pointer),'&'); + g_string_append_c((GString*)*(value.v_pointer),'('); + g_string_append((GString*)*(value.v_pointer),a_string); + g_string_append_c((GString*)*(value.v_pointer),')'); + +} - g_debug("Filter string string b: %s",((GString*)*(value.v_pointer))->str); - if(((GString*)*(value.v_pointer))->len != 0) g_string_append_c((GString*)*(value.v_pointer),'&'); - g_string_append((GString*)*(value.v_pointer),a_string); - g_debug("Filter string string a: %s",((GString*)*(value.v_pointer))->str); +/** + * Output all filter commands on console + * @param hook_data the hook data + */ +void filter_list_commands(void *hook_data) { + + g_print("[field] [op] [value]\n\n"); + + g_print("*** Possible fields ***\n"); + g_print("event.name (string)\n"); + g_print("event.facility (string)\n"); + g_print("event.category (string)\n"); + g_print("event.time (double)\n"); + g_print("event.tsc (integer)\n"); + g_print("event.target_pid (integer)\n"); + g_print("event.field.facility_name.event_name.field_name.subfield_name (field_type)\n"); + g_print("tracefile.name (string)\n"); + g_print("trace.name (string)\n"); + g_print("state.pid (integer)\n"); + g_print("state.ppid (integer)\n"); + g_print("state.creation_time (double)\n"); + g_print("state.insertion_time (double)\n"); + g_print("state.process_name (string)\n"); + g_print("state.thread_brand (string)\n"); + g_print("state.execution_mode (string)\n"); + g_print("state.execution_submode (string)\n"); + g_print("state.process_status (string)\n"); + g_print("state.cpu (string)\n\n"); + + g_print("*** Possible operators ***\n"); + g_print("equal '='\n"); + g_print("not equal '!='\n"); + g_print("greater '>'\n"); + g_print("greater or equal '>='\n"); + g_print("lower '<'\n"); + g_print("lower or equal '<='\n"); + + g_print("*** Possible values ***\n"); + g_print("string, integer, double"); } /** @@ -147,8 +165,6 @@ void filter_analyze_string(void *hook_data) { */ static void init() { - g_print("textFilter::init()\n"); /* debug */ - LttvAttributeValue value; LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); @@ -173,6 +189,11 @@ static void init() { "file name", LTTV_OPT_STRING, &a_file_name, filter_analyze_file, NULL); + lttv_option_add("list", 'l', + "list all possible filter commands for module", + "list commands", + LTTV_OPT_NONE, NULL, filter_list_commands, NULL); + } /** @@ -185,6 +206,8 @@ static void destroy() { lttv_option_remove("filename"); + lttv_option_remove("list"); + LttvAttributeValue value; LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());