From beed0826da72d30455ea860dffa1346ce261a20d Mon Sep 17 00:00:00 2001 From: Yannick Brosseau Date: Fri, 16 Aug 2013 16:38:58 -0400 Subject: [PATCH] Remove reference to thread brand Signed-off-by: Yannick Brosseau --- lttv/lttv/filter.c | 15 ------- lttv/lttv/filter.h | 1 - lttv/lttv/print.c | 3 +- lttv/lttv/state.c | 46 ++------------------- lttv/lttv/state.h | 5 --- lttv/modules/gui/controlflow/drawing.c | 8 ---- lttv/modules/gui/controlflow/eventhooks.c | 1 - lttv/modules/gui/controlflow/eventhooks.h | 1 - lttv/modules/gui/controlflow/processlist.c | 27 ------------ lttv/modules/gui/controlflow/processlist.h | 7 +--- lttv/modules/gui/filter/filter.c | 1 - lttv/modules/gui/resourceview/drawing.c | 8 ---- lttv/modules/gui/resourceview/eventhooks.h | 1 - lttv/modules/gui/resourceview/processlist.h | 4 -- lttv/modules/text/formattedDump.c | 9 +--- lttv/modules/text/textFilter.c | 1 - 16 files changed, 7 insertions(+), 131 deletions(-) diff --git a/lttv/lttv/filter.c b/lttv/lttv/filter.c index 592e562c..0c0ba50e 100644 --- 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 80ec271b..313a6d81 100644 --- 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 e8df4ed9..83bc2f22 100644 --- 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 d019c810..2648721b 100644 --- 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," \n", + fprintf(fp," \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," \n", + fprintf(fp," \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 109ee646..8a86c369 100644 --- 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 f1441e05..eeb27e47 100644 --- 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 242f9457..88f06a99 100644 --- 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 ab457ff7..db199a83 100644 --- 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 ed775422..2cf4426a 100644 --- 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 d7bb66ca..707bb217 100644 --- 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 a69685f8..9bc71415 100644 --- 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 bba1f984..ecb8270d 100644 --- 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 09efbfae..2b5b0a40 100644 --- 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 e627d694..4565c05f 100644 --- 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 c4054aa7..5311d4a6 100644 --- 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 73947b3f..3630b8e1 100644 --- 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"); -- 2.34.1