Remove reference to thread brand

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>

diff --git a/lttv/lttv/filter.c b/lttv/lttv/filter.c
index 592e562cfe96ff662cb4753ce35292219a8429c0..0c0ba50e2f42e0fb8ce2d479fde4ef0a959190b2 100644 (file)
--- a/lttv/lttv/filter.c
+++ b/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)
@@ -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
@@ -213,9 +211,6 @@ gboolean lttv_simple_expression_assign_field(GPtrArray* fp,
                else if(!g_ascii_strcasecmp(f->str,"process_name") ) {
                        se->field = LTTV_FILTER_STATE_P_NAME;
                }
-               else if(!g_ascii_strcasecmp(f->str,"thread_brand") ) {
-                       se->field = LTTV_FILTER_STATE_T_BRAND;
-               }
                else if(!g_ascii_strcasecmp(f->str,"execution_mode") ) {
                        se->field = LTTV_FILTER_STATE_EX_MODE;
                }
@@ -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:
@@ -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);

diff --git a/lttv/lttv/filter.h b/lttv/lttv/filter.h
index 80ec271b8a2a8dca9d61ae81b44cbe67bc310ab4..313a6d81154dfbee53ce98085a241780d25b48e9 100644 (file)
--- a/lttv/lttv/filter.h
+++ b/lttv/lttv/filter.h
@@ -101,7 +101,6 @@ enum _LttvFieldType {
        LTTV_FILTER_STATE_CT,           /**< state.creation_time (double) */
        LTTV_FILTER_STATE_IT,           /**< state.insertion_time (double) */
        LTTV_FILTER_STATE_P_NAME,       /**< state.process_name (char*) */
-       LTTV_FILTER_STATE_T_BRAND,      /**< state.thread_brand (char*) */
        LTTV_FILTER_STATE_EX_MODE,      /**< state.execution_mode (LttvExecutionMode) */
        LTTV_FILTER_STATE_EX_SUBMODE,   /**< state.execution_submode (LttvExecutionSubmode) */
        LTTV_FILTER_STATE_P_STATUS,     /**< state.process_status (LttvProcessStatus) */

diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index e8df4ed9f12d5853a44e1a1712db231f186d7d4c..83bc2f224afcce6493a4d4a0912ee98c7041666c 100644 (file)
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -489,11 +489,10 @@ void lttv_event_to_string(LttEvent *e, GString *s, gboolean mandatory_fields,
                                        ltt_trace_name(ltt_tracefile_get_trace(tfs->parent.tf))),
                        g_quark_to_string(ltt_tracefile_name(tfs->parent.tf)), cpu);
                /* Print the process id and the state/interrupt type of the process */
-               g_string_append_printf(s,", %u, %u, %s, %s, %u, 0x%" PRIx64", %s",
+               g_string_append_printf(s,", %u, %u, %s, %u, 0x%" PRIx64", %s",
                        process->pid,
                        process->tgid,
                        g_quark_to_string(process->name),
-                       g_quark_to_string(process->brand),
                        process->ppid,
                        process->current_function,
                        g_quark_to_string(process->state->t));

diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c
index d019c810da5afb9715bf770af7fea6c80397eab7..2648721be54432732f023d10f4011c4080250d56 100644 (file)
--- a/lttv/lttv/state.c
+++ b/lttv/lttv/state.c
@@ -82,7 +82,6 @@ GQuark
        LTT_EVENT_STATEDUMP_END,
        LTT_EVENT_FUNCTION_ENTRY,
        LTT_EVENT_FUNCTION_EXIT,
-       LTT_EVENT_THREAD_BRAND,
        LTT_EVENT_REQUEST_ISSUE,
        LTT_EVENT_REQUEST_COMPLETE,
        LTT_EVENT_LIST_INTERRUPT,
@@ -154,9 +153,6 @@ LttvProcessStatus
        LTTV_STATE_RUN,
        LTTV_STATE_DEAD;
 
-GQuark
-       LTTV_STATE_UNBRANDED;
-
 LttvProcessType
        LTTV_STATE_USER_THREAD,
        LTTV_STATE_KERNEL_THREAD;
@@ -675,7 +671,7 @@ static void write_process_state(gpointer key, gpointer value,
        guint64 address;
 
        process = (LttvProcessState *)value;
-       fprintf(fp,"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
+       fprintf(fp,"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
                        process, process->pid, process->tgid, process->ppid,
                        g_quark_to_string(process->type),
                        process->creation_time.tv_sec,
@@ -683,7 +679,6 @@ static void write_process_state(gpointer key, gpointer value,
                        process->insertion_time.tv_sec,
                        process->insertion_time.tv_nsec,
                        g_quark_to_string(process->name),
-                       g_quark_to_string(process->brand),
                        process->cpu, process->free_events);
 
        for(i = 0 ; i < process->execution_stack->len; i++) {
@@ -773,9 +768,7 @@ static void write_process_state_raw(gpointer key, gpointer value,
        //fprintf(fp, "%s", g_quark_to_string(process->name));
        //fputc('\0', fp);
        fwrite(&process->name, sizeof(process->name), 1, fp);
-       //fprintf(fp, "%s", g_quark_to_string(process->brand));
        //fputc('\0', fp);
-       fwrite(&process->brand, sizeof(process->brand), 1, fp);
        fwrite(&process->pid, sizeof(process->pid), 1, fp);
        fwrite(&process->free_events, sizeof(process->free_events), 1, fp);
        fwrite(&process->tgid, sizeof(process->tgid), 1, fp);
@@ -785,7 +778,7 @@ static void write_process_state_raw(gpointer key, gpointer value,
        fwrite(&process->insertion_time, sizeof(process->insertion_time), 1, fp);
 
 #if 0
-       fprintf(fp,"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
+       fprintf(fp,"  <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" CPU=\"%u\" PROCESS_TYPE=%u>\n",
                        process, process->pid, process->tgid, process->ppid,
                        g_quark_to_string(process->type),
                        process->creation_time.tv_sec,
@@ -793,7 +786,6 @@ static void write_process_state_raw(gpointer key, gpointer value,
                        process->insertion_time.tv_sec,
                        process->insertion_time.tv_nsec,
                        g_quark_to_string(process->name),
-                       g_quark_to_string(process->brand),
                        process->cpu);
 #endif //0
 
@@ -908,7 +900,6 @@ static void read_process_state_raw(LttvTraceState *self, FILE *fp,
 
        res = fread(&tmp.type, sizeof(tmp.type), 1, fp);
        res += fread(&tmp.name, sizeof(tmp.name), 1, fp);
-       res += fread(&tmp.brand, sizeof(tmp.brand), 1, fp);
        res += fread(&tmp.pid, sizeof(tmp.pid), 1, fp);
        res += fread(&tmp.free_events, sizeof(tmp.free_events), 1, fp);
        res += fread(&tmp.tgid, sizeof(tmp.tgid), 1, fp);
@@ -938,8 +929,6 @@ static void read_process_state_raw(LttvTraceState *self, FILE *fp,
                        (gchar*)g_ptr_array_index(quarktable, tmp.type));
        process->tgid = tmp.tgid;
        process->ppid = tmp.ppid;
-       process->brand = g_quark_from_string(
-                       (gchar*)g_ptr_array_index(quarktable, tmp.brand));
        process->name =
                        g_quark_from_string((gchar*)g_ptr_array_index(quarktable, tmp.name));
        process->free_events = tmp.free_events;
@@ -2128,11 +2117,10 @@ static void pop_state(LttvEvent *event,
                g_info("process state has %s when pop_int is %s\n",
                                g_quark_to_string(process->state->t),
                                g_quark_to_string(t));
-               g_info("{ %u, %u, %s, %s, %s }\n",
+               g_info("{ %u, %u, %s, %s }\n",
                                process->pid,
                                process->ppid,
                                g_quark_to_string(process->name),
-                               g_quark_to_string(process->brand),
                                g_quark_to_string(process->state->s));
                return;
        }
@@ -2180,7 +2168,6 @@ LttvProcessState *lttv_state_create_process(LttvTraceState *tcs,
        process->tgid = tgid;
        process->cpu = cpu;
        process->name = name;
-       process->brand = LTTV_STATE_UNBRANDED;
        //process->last_cpu = tfs->cpu_name;
        //process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
        process->type = LTTV_STATE_USER_THREAD;
@@ -2970,7 +2957,6 @@ static gboolean process_fork(void *hook_data, void *call_data)
        }
        g_assert(child_process->name == LTTV_STATE_UNNAMED);
        child_process->name = process->name;
-       child_process->brand = process->brand;
 
        return FALSE;
 }
@@ -3128,27 +3114,9 @@ static gboolean process_exec(void *hook_data, void *call_data)
 
        process->name = g_quark_from_string(lttv_event_get_string(event,
                                                                  "filename"));
-       process->brand = LTTV_STATE_UNBRANDED;
        //g_free(null_term_name);
        return FALSE;
 }
-#ifdef BABEL_CLEANUP
-static gboolean thread_brand(void *hook_data, void *call_data)
-{
-       LttvTracefileState *s = (LttvTracefileState *)call_data;
-       LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
-       LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-       LttvTraceHook *th = (LttvTraceHook *)hook_data;
-       gchar *name;
-       guint cpu = s->cpu;
-       LttvProcessState *process = ts->running_process[cpu];
-
-       name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
-       process->brand = g_quark_from_string(name);
-
-       return FALSE;
-}
-#endif
 #if 0
        // TODO We only have sys_open, without the FD
        // manage to do somehting better
@@ -3621,12 +3589,6 @@ void lttv_state_add_event_hooks(LttvTraceset *traceset)
                                FIELD_ARRAY(LTT_FIELD_FILENAME),
                                process_exec, NULL, &hooks);
 
-               lttv_trace_find_hook(ts->parent.t,
-                               LTT_CHANNEL_USERSPACE,
-                               LTT_EVENT_THREAD_BRAND,
-                               FIELD_ARRAY(LTT_FIELD_NAME),
-                               thread_brand, NULL, &hooks);
-
                 /* statedump-related hooks */
                lttv_trace_find_hook(ts->parent.t,
                                LTT_CHANNEL_TASK_STATE,
@@ -4427,7 +4389,6 @@ GType lttv_tracefile_state_get_type(void)
 static void module_init(void)
 {
        LTTV_STATE_UNNAMED = g_quark_from_string("");
-       LTTV_STATE_UNBRANDED = g_quark_from_string("");
        LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("MODE_UNKNOWN");
        LTTV_STATE_USER_MODE = g_quark_from_string("USER_MODE");
        LTTV_STATE_MAYBE_USER_MODE = g_quark_from_string("MAYBE_USER_MODE");
@@ -4508,7 +4469,6 @@ static void module_init(void)
        LTT_EVENT_STATEDUMP_END  = g_quark_from_string("statedump_end");
        LTT_EVENT_FUNCTION_ENTRY  = g_quark_from_string("function_entry");
        LTT_EVENT_FUNCTION_EXIT  = g_quark_from_string("function_exit");
-       LTT_EVENT_THREAD_BRAND  = g_quark_from_string("thread_brand");
        LTT_EVENT_REQUEST_ISSUE = g_quark_from_string("_blk_request_issue");
        LTT_EVENT_REQUEST_COMPLETE = g_quark_from_string("_blk_request_complete");
        LTT_EVENT_LIST_INTERRUPT = g_quark_from_string("interrupt");

diff --git a/lttv/lttv/state.h b/lttv/lttv/state.h
index 109ee64600622d7fbfd98a4ed7b11420e8f87997..8a86c369160a6bc94ca3706078f982b6f8e96701 100644 (file)
--- a/lttv/lttv/state.h
+++ b/lttv/lttv/state.h
@@ -119,7 +119,6 @@ extern GQuark
        LTT_EVENT_STATEDUMP_END,
        //LTT_EVENT_FUNCTION_ENTRY,
        //LTT_EVENT_FUNCTION_EXIT,
-       LTT_EVENT_THREAD_BRAND,
        LTT_EVENT_REQUEST_ISSUE,
        LTT_EVENT_REQUEST_COMPLETE,
        LTT_EVENT_LIST_INTERRUPT,
@@ -247,9 +246,6 @@ extern LttvProcessStatus
        LTTV_STATE_RUN,
        LTTV_STATE_DEAD;
 
-extern GQuark
-       LTTV_STATE_UNBRANDED;
-
 typedef GQuark LttvProcessType;
 
 extern LttvProcessType
@@ -294,7 +290,6 @@ typedef struct _LttvProcessState {
        LttTime creation_time;
        LttTime insertion_time;
        GQuark name;
-       GQuark brand;
        GQuark pid_time;
        GArray *execution_stack;         /* Array of LttvExecutionState */
        LttvExecutionState *state;       /* Top of interrupt stack */

diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index f1441e0517aff10559cf07a92f6c20f974d734b5..eeb27e4719f026ec66e6ef151da301c0304449d9 100644 (file)
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -411,14 +411,6 @@ void drawing_data_request(Drawing_t *drawing,
           events_request,
           &hooks);
 
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_USERSPACE,
-          LTT_EVENT_THREAD_BRAND,
-          FIELD_ARRAY(LTT_FIELD_NAME),
-          after_user_generic_thread_brand_hook,
-          events_request,
-          &hooks);
-
       lttv_trace_find_hook(ts->parent.t,
           LTT_CHANNEL_TASK_STATE,
           LTT_EVENT_PROCESS_STATE,

diff --git a/lttv/modules/gui/controlflow/eventhooks.c b/lttv/modules/gui/controlflow/eventhooks.c
index 242f9457956e0d4c45409c3372a4f040b3dea409..88f06a99d130293a2394409fa6f3d577f12977f7 100644 (file)
--- a/lttv/modules/gui/controlflow/eventhooks.c
+++ b/lttv/modules/gui/controlflow/eventhooks.c
@@ -306,7 +306,6 @@ HashedProcessData *get_hashed_process_data(ControlFlowData *control_flow_data,
                                &birth,
                                trace_num,
                                process->name,
-                               process->brand,
                                &pl_height,
                                &process_info,
                                &hashed_process_data);

diff --git a/lttv/modules/gui/controlflow/eventhooks.h b/lttv/modules/gui/controlflow/eventhooks.h
index ab457ff7888b5d2d404a3c0a83765ba3d359a419..db199a8328fed727b24d08eb4a87ed110ab3447f 100644 (file)
--- a/lttv/modules/gui/controlflow/eventhooks.h
+++ b/lttv/modules/gui/controlflow/eventhooks.h
@@ -94,7 +94,6 @@ int before_process_release_hook(void *hook_data, void *call_data);
 int after_process_exit_hook(void *hook_data, void *call_data);
 int after_process_fork_hook(void *hook_data, void *call_data);
 int after_fs_exec_hook(void *hook_data, void *call_data);
-int after_user_generic_thread_brand_hook(void *hook_data, void *call_data);
 int after_event_enum_process_hook(void *hook_data, void *call_data);
 
 #if 0

diff --git a/lttv/modules/gui/controlflow/processlist.c b/lttv/modules/gui/controlflow/processlist.c
index ed775422c8c07aa5969bddec97124e420b21df11..2cf4426a3698a22e5f31cf80dc5ed37c19e84497 100644 (file)
--- a/lttv/modules/gui/controlflow/processlist.c
+++ b/lttv/modules/gui/controlflow/processlist.c
@@ -47,13 +47,11 @@ gint process_sort_func  ( GtkTreeModel *model,
         gpointer user_data)
 {
   gchar *a_name;
-  gchar *a_brand;
   guint a_pid, a_tgid, a_ppid, a_cpu;
   gulong a_birth_s, a_birth_ns;
   guint a_trace;
 
   gchar *b_name;
-  gchar *b_brand;
   guint b_pid, b_tgid, b_ppid, b_cpu;
   gulong b_birth_s, b_birth_ns;
   guint b_trace;
@@ -61,7 +59,6 @@ gint process_sort_func  ( GtkTreeModel *model,
   gtk_tree_model_get(model,
            it_a,
            PROCESS_COLUMN, &a_name,
-           BRAND_COLUMN, &a_brand,
            PID_COLUMN, &a_pid,
            TGID_COLUMN, &a_tgid,
            PPID_COLUMN, &a_ppid,
@@ -74,7 +71,6 @@ gint process_sort_func  ( GtkTreeModel *model,
   gtk_tree_model_get(model,
            it_b,
            PROCESS_COLUMN, &b_name,
-           BRAND_COLUMN, &b_brand,
            PID_COLUMN, &b_pid,
            TGID_COLUMN, &b_tgid,
            PPID_COLUMN, &b_ppid,
@@ -356,7 +352,6 @@ ProcessList *processlist_construct(void)
 
   /* Create the Process list */
   process_list->list_store = gtk_list_store_new (  N_COLUMNS,
-              G_TYPE_STRING,
               G_TYPE_STRING,
               G_TYPE_UINT,
               G_TYPE_UINT,
@@ -425,17 +420,6 @@ ProcessList *processlist_construct(void)
   
   process_list->button = column->button;
  
-  column = gtk_tree_view_column_new_with_attributes ( "Brand",
-                renderer,
-                "text",
-                BRAND_COLUMN,
-                NULL);
-  gtk_tree_view_column_set_alignment (column, 0.0);
-  gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_append_column (
-    GTK_TREE_VIEW (process_list->process_list_widget), column);
-
   column = gtk_tree_view_column_new_with_attributes ( "PID",
                 renderer,
                 "text",
@@ -590,15 +574,6 @@ void processlist_set_name(ProcessList *process_list,
         -1);
 }
 
-void processlist_set_brand(ProcessList *process_list,
-    GQuark brand,
-    HashedProcessData *hashed_process_data)
-{
-  gtk_list_store_set (  process_list->list_store, &hashed_process_data->y_iter,
-        BRAND_COLUMN, g_quark_to_string(brand),
-        -1);
-}
-
 void processlist_set_tgid(ProcessList *process_list,
     guint tgid,
     HashedProcessData *hashed_process_data)
@@ -627,7 +602,6 @@ int processlist_add(  ProcessList *process_list,
       LttTime *birth,
       guint trace_num,
       GQuark name,
-      GQuark brand,
       guint *height,
       ProcessInfo **pm_process_info,
       HashedProcessData **pm_hashed_process_data)
@@ -685,7 +659,6 @@ int processlist_add(  ProcessList *process_list,
 
   gtk_list_store_set (  process_list->list_store, &hashed_process_data->y_iter,
         PROCESS_COLUMN, g_quark_to_string(name),
-        BRAND_COLUMN, g_quark_to_string(brand),
         PID_COLUMN, pid,
         TGID_COLUMN, tgid,
         PPID_COLUMN, ppid,

diff --git a/lttv/modules/gui/controlflow/processlist.h b/lttv/modules/gui/controlflow/processlist.h
index d7bb66ca7f473761a79949df0e9804af6cb87233..707bb217e1eaacbc3fe86c7bc3bfecc379e2bd91 100644 (file)
--- a/lttv/modules/gui/controlflow/processlist.h
+++ b/lttv/modules/gui/controlflow/processlist.h
@@ -45,7 +45,6 @@
 enum
 {
   PROCESS_COLUMN,
-  BRAND_COLUMN,
   PID_COLUMN,
   TGID_COLUMN,
   PPID_COLUMN,
@@ -135,7 +134,7 @@ void processlist_clear(ProcessList *process_list);
 /* CPU num is only used for PID 0 */
 int processlist_add(ProcessList *process_list, Drawing_t * drawing, 
     guint pid, guint tgid, guint cpu, guint ppid,
-    LttTime *birth, guint trace_num, GQuark name, GQuark brand, guint *height,
+    LttTime *birth, guint trace_num, GQuark name, guint *height,
     ProcessInfo **process_info,
     HashedProcessData **hashed_process_data);
 // out : success (0) and height
@@ -147,10 +146,6 @@ void processlist_set_name(ProcessList *process_list,
     GQuark name,
     HashedProcessData *hashed_process_data);
 
-void processlist_set_brand(ProcessList *process_list,
-    GQuark brand,
-    HashedProcessData *hashed_process_data);
-
 /* Set the ppid of a process */
 void processlist_set_tgid(ProcessList *process_list,
     guint tgid,

diff --git a/lttv/modules/gui/filter/filter.c b/lttv/modules/gui/filter/filter.c
index a69685f8f8b58559187a7e10fd8e828d313a1748..9bc71415649b2214fe6a735cf8692cde99c2cbb1 100644 (file)
--- a/lttv/modules/gui/filter/filter.c
+++ b/lttv/modules/gui/filter/filter.c
@@ -196,7 +196,6 @@ gui_filter(LttvPlugin *plugin)
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("channel.name"));
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("trace.name"));
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.process_name"));
-  g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.thread_brand"));
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.pid"));
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.ppid"));
   g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.creation_time"));

diff --git a/lttv/modules/gui/resourceview/drawing.c b/lttv/modules/gui/resourceview/drawing.c
index bba1f984806e957abba2b75e66f037bc60835331..ecb8270d8a73b0f0e34444c500a1949f748fba78 100644 (file)
--- a/lttv/modules/gui/resourceview/drawing.c
+++ b/lttv/modules/gui/resourceview/drawing.c
@@ -427,14 +427,6 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_USER_GENERIC,
-//          LTT_EVENT_THREAD_BRAND,
-//          FIELD_ARRAY(LTT_FIELD_NAME),
-//          after_user_generic_thread_brand_hook,
-//          events_request,
-//          &hooks);
-//
-//      lttv_trace_find_hook(ts->parent.t,
 //          LTT_FACILITY_LIST,
 //          LTT_EVENT_PROCESS_STATE,
 //          FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),

diff --git a/lttv/modules/gui/resourceview/eventhooks.h b/lttv/modules/gui/resourceview/eventhooks.h
index 09efbfae31055e55971b30c1abdc7032ba1e3321..2b5b0a40624e7da4ab0446237f021876f35d86e9 100644 (file)
--- a/lttv/modules/gui/resourceview/eventhooks.h
+++ b/lttv/modules/gui/resourceview/eventhooks.h
@@ -93,7 +93,6 @@ int before_process_release_hook(void *hook_data, void *call_data);
 int after_process_exit_hook(void *hook_data, void *call_data);
 int after_process_fork_hook(void *hook_data, void *call_data);
 int after_fs_exec_hook(void *hook_data, void *call_data);
-int after_user_generic_thread_brand_hook(void *hook_data, void *call_data);
 int after_event_enum_process_hook(void *hook_data, void *call_data);
 
 #if 0

diff --git a/lttv/modules/gui/resourceview/processlist.h b/lttv/modules/gui/resourceview/processlist.h
index e627d694a9c9d6e3f3c1adc2f8cfc6e7b22a3aaa..4565c05f7424cbe9ebea9c3a79801aad5029955f 100644 (file)
--- a/lttv/modules/gui/resourceview/processlist.h
+++ b/lttv/modules/gui/resourceview/processlist.h
@@ -168,10 +168,6 @@ void processlist_set_name(ProcessList *process_list,
     GQuark name,
     HashedResourceData *hashed_process_data);
 
-void processlist_set_brand(ProcessList *process_list,
-    GQuark brand,
-    HashedResourceData *hashed_process_data);
-
 /* Set the ppid of a process */
 void processlist_set_tgid(ProcessList *process_list,
     guint tgid,

diff --git a/lttv/modules/text/formattedDump.c b/lttv/modules/text/formattedDump.c
index c4054aa761b0e15f606d1f019dbda3b25a9f60e4..5311d4a6883d6bd564f5fb4eb7c8a52841019bf8 100644 (file)
--- a/lttv/modules/text/formattedDump.c
+++ b/lttv/modules/text/formattedDump.c
@@ -60,9 +60,9 @@ static LttvHooks *event_hook;
 
 static const char default_format[] =
                "channel:%c event:%e timestamp:%t elapsed:%l cpu:%u pid:%d "
-               "ppid:%i tgpid:%g process:%p brand:%b state:%a payload:{ %m }";
+               "ppid:%i tgpid:%g process:%p state:%a payload:{ %m }";
 static const char textDump_format[] =
-               "%c.%e: %s.%n (%r/%c_%u), %d, %g, %p, %b, %i, %y, %a { %m }";
+               "%c.%e: %s.%n (%r/%c_%u), %d, %g, %p, %i, %y, %a { %m }";
 static const char strace_format[] = "%e(%m) %s.%n";
 static const char *fmt;
 
@@ -254,10 +254,6 @@ void lttv_event_to_string(LttEvent *e, GString *string_buffer, gboolean mandator
                                g_string_append(string_buffer,
                                                g_quark_to_string(process->name));
                                break;
-                       case 'b':
-                               g_string_append(string_buffer,
-                                               g_quark_to_string(process->brand));
-                               break;
                        case 'u':
                                g_string_append_printf(string_buffer, "%u", cpu);
                                break;
@@ -363,7 +359,6 @@ static void init()
                        "               %i   ppid\n"
                        "               %g   tgid\n"
                        "               %u   cpu\n"
-                       "               %b   brand\n"
                        "               %a   state\n"
                        "               %y   memory address\n"
                        "               %m   markers and tracepoints fields\n",

diff --git a/lttv/modules/text/textFilter.c b/lttv/modules/text/textFilter.c
index 73947b3f33c07b90d9a246401479e01aabd9d885..3630b8e19ec14fde69ab6201d7096fc3b85c753a 100644 (file)
--- a/lttv/modules/text/textFilter.c
+++ b/lttv/modules/text/textFilter.c
@@ -144,7 +144,6 @@ void filter_list_commands(void *hook_data) {
   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");