Update FSF address

[lttv.git] / lttv / lttv / filter.c

diff --git a/lttv/lttv/filter.c b/lttv/lttv/filter.c
index 29721d4de2d593c5a253141a0c9b21548af430cd..c92d9862264cb6599a8c4e4a5d869f116f4b7d77 100644 (file)
--- a/lttv/lttv/filter.c
+++ b/lttv/lttv/filter.c
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 /*! \file lttv/lttv/filter.c
@@ -53,7 +53,6 @@
  *    |->creation_time (LttTime)
  *    |->insertion_time (LttTime)
  *    |->process_name (String, converted to GQuark)
- *    |->thread_brand (String, converted to GQuark)
  *    |->execution_mode (LttvExecutionMode)
  *    |->execution_submode (LttvExecutionSubmode)
  *    |->process_status (LttvProcessStatus)
@@ -156,22 +155,22 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
         * as a dynamic field
         */
 
-       if(!g_strcasecmp(f->str,"trace") ) {
+       if(!g_ascii_strcasecmp(f->str,"trace") ) {
                /*
                 * Possible values:
                 *      trace.name
                 */
                g_string_free(f,TRUE);
                f=ltt_g_ptr_array_remove_index_slow(fp,0);
-               if(!g_strcasecmp(f->str,"name")) {
+               if(!g_ascii_strcasecmp(f->str,"name")) {
                        se->field = LTTV_FILTER_TRACE_NAME;
                }
-       } else if(!g_strcasecmp(f->str,"traceset") ) {
+       } else if(!g_ascii_strcasecmp(f->str,"traceset") ) {
                /*
                 * FIXME: not yet implemented !
                 */
-       } else if(!g_strcasecmp(f->str,"tracefile")
-                                               || !g_strcasecmp(f->str,"channel") ) {
+       } else if(!g_ascii_strcasecmp(f->str,"tracefile")
+                                               || !g_ascii_strcasecmp(f->str,"channel") ) {
                /*
                 * Possible values:
                 *      tracefile.name
@@ -179,10 +178,10 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
                 */
                g_string_free(f,TRUE);
                f=ltt_g_ptr_array_remove_index_slow(fp,0);
-               if(!g_strcasecmp(f->str,"name")) {
+               if(!g_ascii_strcasecmp(f->str,"name")) {
                        se->field = LTTV_FILTER_TRACEFILE_NAME;
                }
-       } else if(!g_strcasecmp(f->str,"state") ) {
+       } else if(!g_ascii_strcasecmp(f->str,"state") ) {
                /*
                 * Possible values:
                 *      state.pid
@@ -190,7 +189,6 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
                 *      state.creation_time
                 *      state.insertion_time
                 *      state.process_name
-                *      state.thread_brand
                 *      state.execution_mode
                 *      state.execution_submode
                 *      state.process_status
@@ -198,37 +196,34 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
                 */
                g_string_free(f,TRUE);
                f=ltt_g_ptr_array_remove_index_slow(fp,0);
-               if(!g_strcasecmp(f->str,"pid") ) {
+               if(!g_ascii_strcasecmp(f->str,"pid") ) {
                        se->field = LTTV_FILTER_STATE_PID;
                }
-               else if(!g_strcasecmp(f->str,"ppid") ) {
+               else if(!g_ascii_strcasecmp(f->str,"ppid") ) {
                        se->field = LTTV_FILTER_STATE_PPID;
                }
-               else if(!g_strcasecmp(f->str,"creation_time") ) {
+               else if(!g_ascii_strcasecmp(f->str,"creation_time") ) {
                        se->field = LTTV_FILTER_STATE_CT;
                }
-               else if(!g_strcasecmp(f->str,"insertion_time") ) {
+               else if(!g_ascii_strcasecmp(f->str,"insertion_time") ) {
                        se->field = LTTV_FILTER_STATE_IT;
                }
-               else if(!g_strcasecmp(f->str,"process_name") ) {
+               else if(!g_ascii_strcasecmp(f->str,"process_name") ) {
                        se->field = LTTV_FILTER_STATE_P_NAME;
                }
-               else if(!g_strcasecmp(f->str,"thread_brand") ) {
-                       se->field = LTTV_FILTER_STATE_T_BRAND;
-               }
-               else if(!g_strcasecmp(f->str,"execution_mode") ) {
+               else if(!g_ascii_strcasecmp(f->str,"execution_mode") ) {
                        se->field = LTTV_FILTER_STATE_EX_MODE;
                }
-               else if(!g_strcasecmp(f->str,"execution_submode") ) {
+               else if(!g_ascii_strcasecmp(f->str,"execution_submode") ) {
                        se->field = LTTV_FILTER_STATE_EX_SUBMODE;
                }
-               else if(!g_strcasecmp(f->str,"process_status") ) {
+               else if(!g_ascii_strcasecmp(f->str,"process_status") ) {
                        se->field = LTTV_FILTER_STATE_P_STATUS;
                }
-               else if(!g_strcasecmp(f->str,"cpu") ) {
+               else if(!g_ascii_strcasecmp(f->str,"cpu") ) {
                        se->field = LTTV_FILTER_STATE_CPU;
                }
-       } else if(!g_strcasecmp(f->str,"event") ) {
+       } else if(!g_ascii_strcasecmp(f->str,"event") ) {
                /*
                 * Possible values:
                 *      event.name
@@ -242,28 +237,28 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
                g_string_free(f,TRUE);
                f=ltt_g_ptr_array_remove_index_slow(fp,0);
 
-               if(!g_strcasecmp(f->str,"name") ) {
+               if(!g_ascii_strcasecmp(f->str,"name") ) {
                        se->field = LTTV_FILTER_EVENT_NAME;
                }
-               else if(!g_strcasecmp(f->str,"subname") ) {
+               else if(!g_ascii_strcasecmp(f->str,"subname") ) {
                        se->field = LTTV_FILTER_EVENT_SUBNAME;
                }
-               else if(!g_strcasecmp(f->str,"category") ) {
+               else if(!g_ascii_strcasecmp(f->str,"category") ) {
                        /*
                         * FIXME: Category not yet functional in lttv
                         */
                        se->field = LTTV_FILTER_EVENT_CATEGORY;
                }
-               else if(!g_strcasecmp(f->str,"time") ) {
+               else if(!g_ascii_strcasecmp(f->str,"time") ) {
                        se->field = LTTV_FILTER_EVENT_TIME;
                }
-               else if(!g_strcasecmp(f->str,"tsc") ) {
+               else if(!g_ascii_strcasecmp(f->str,"tsc") ) {
                        se->field = LTTV_FILTER_EVENT_TSC;
                }
-               else if(!g_strcasecmp(f->str,"target_pid") ) {
+               else if(!g_ascii_strcasecmp(f->str,"target_pid") ) {
                        se->field = LTTV_FILTER_EVENT_TARGET_PID;
                }
-               else if(!g_strcasecmp(f->str,"field") ) {
+               else if(!g_ascii_strcasecmp(f->str,"field") ) {
                        se->field = LTTV_FILTER_EVENT_FIELD;
                        g_string_free(f,TRUE);
                        f=ltt_g_ptr_array_remove_index_slow(fp,0);
@@ -313,7 +308,6 @@ gboolean lttv_simple_expression_assign_operator(LttvSimpleExpression* se,
        case LTTV_FILTER_TRACE_NAME:
        case LTTV_FILTER_TRACEFILE_NAME:
        case LTTV_FILTER_STATE_P_NAME:
-       case LTTV_FILTER_STATE_T_BRAND:
        case LTTV_FILTER_EVENT_SUBNAME:
        case LTTV_FILTER_STATE_EX_MODE:
        case LTTV_FILTER_STATE_EX_SUBMODE:
@@ -492,7 +486,6 @@ gboolean lttv_simple_expression_assign_value(LttvSimpleExpression* se,
                case LTTV_FILTER_TRACE_NAME:
                case LTTV_FILTER_TRACEFILE_NAME:
                case LTTV_FILTER_STATE_P_NAME:
-               case LTTV_FILTER_STATE_T_BRAND:
                case LTTV_FILTER_EVENT_SUBNAME:
                case LTTV_FILTER_STATE_EX_MODE:
                case LTTV_FILTER_STATE_EX_SUBMODE:
@@ -628,7 +621,6 @@ gint lttv_struct_type(gint ft)
                case LTTV_FILTER_STATE_CT:
                case LTTV_FILTER_STATE_IT:
                case LTTV_FILTER_STATE_P_NAME:
-               case LTTV_FILTER_STATE_T_BRAND:
                case LTTV_FILTER_STATE_EX_MODE:
                case LTTV_FILTER_STATE_EX_SUBMODE:
                case LTTV_FILTER_STATE_P_STATUS:
@@ -736,7 +728,7 @@ gboolean lttv_apply_op_eq_double(const gpointer v1, LttvFieldValue v2)
 gboolean lttv_apply_op_eq_string(const gpointer v1, LttvFieldValue v2)
 {
        char* r = (char*) v1;
-       return (!g_strcasecmp(r,v2.v_string));
+       return (!g_ascii_strcasecmp(r,v2.v_string));
 }
 
 /**
@@ -876,7 +868,7 @@ gboolean lttv_apply_op_ne_double(const gpointer v1, LttvFieldValue v2)
 gboolean lttv_apply_op_ne_string(const gpointer v1, LttvFieldValue v2)
 {
        char* r = (char*) v1;
-       return (g_strcasecmp(r,v2.v_string));
+       return (g_ascii_strcasecmp(r,v2.v_string));
 }
 
 /**
@@ -2144,13 +2136,6 @@ gboolean lttv_filter_tree_parse_branch(
                        return se->op((gpointer)&quark,v);
                }
                break;
-       case LTTV_FILTER_STATE_T_BRAND:
-               if(state == NULL) return TRUE;
-               else {
-                       GQuark quark = state->brand;
-                       return se->op((gpointer)&quark,v);
-               }
-               break;
        case LTTV_FILTER_STATE_EX_MODE:
                if(state == NULL) return TRUE;
                else return se->op((gpointer)&state->state->t,v);
@@ -2213,6 +2198,7 @@ gboolean lttv_filter_tree_parse_branch(
                        return se->op((gpointer)&count,v);
                }
                break;
+#if BABEL_CLEANUP
        case LTTV_FILTER_EVENT_TARGET_PID:
                if(context == NULL) return TRUE;
                else {
@@ -2221,6 +2207,7 @@ gboolean lttv_filter_tree_parse_branch(
                        return se->op((gpointer)&target_pid,v);
                }
                break;
+#endif
        case LTTV_FILTER_EVENT_FIELD:
                /*
                 * TODO: Use the offset to