From 0828099d440cd8d5a4833760ee8b1e43cf090ce2 Mon Sep 17 00:00:00 2001 From: compudj Date: Wed, 11 Aug 2004 18:39:11 +0000 Subject: [PATCH] STATE_EXIT -> STATE_ZOMBIE git-svn-id: http://ltt.polymtl.ca/svn@700 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/lttv/lttv/state.c | 11 ++++----- ltt/branches/poly/lttv/lttv/state.h | 2 +- .../lttv/modules/gui/controlflow/drawing.c | 2 +- .../lttv/modules/gui/controlflow/drawing.h | 2 +- .../lttv/modules/gui/controlflow/eventhooks.c | 24 +++++++++---------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index fbe72542..e9624740 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -41,7 +41,7 @@ LttvProcessStatus LTTV_STATE_UNNAMED, LTTV_STATE_WAIT_FORK, LTTV_STATE_WAIT_CPU, - LTTV_STATE_EXIT, + LTTV_STATE_ZOMBIE, LTTV_STATE_WAIT, LTTV_STATE_RUN; @@ -969,14 +969,13 @@ static gboolean schedchange(void *hook_data, void *call_data) g_assert(s->process->pid == 0); } - if(s->process->state->s != LTTV_STATE_EXIT) { + if(s->process->state->s != LTTV_STATE_ZOMBIE) { if(state_out == 0) s->process->state->s = LTTV_STATE_WAIT_CPU; else s->process->state->s = LTTV_STATE_WAIT; } /* FIXME : we do not remove process here, because the kernel * still has them : they may be zombies. We need to know * exactly when release_task is executed on the PID to - * know when the zombie is destroyed. We should rename STATE_EXIT - * for STATE_ZOMBIE. + * know when the zombie is destroyed. */ //else // exit_process(s, s->process); @@ -1018,7 +1017,7 @@ static gboolean process_fork(LttvTraceHook *trace_hook, LttvTracefileState *s) static gboolean process_exit(LttvTraceHook *trace_hook, LttvTracefileState *s) { if(s->process != NULL) { - s->process->state->s = LTTV_STATE_EXIT; + s->process->state->s = LTTV_STATE_ZOMBIE; } return FALSE; } @@ -1572,7 +1571,7 @@ static void module_init() LTTV_STATE_SUBMODE_UNKNOWN = g_quark_from_string("unknown submode"); LTTV_STATE_SUBMODE_NONE = g_quark_from_string("(no submode)"); LTTV_STATE_WAIT_CPU = g_quark_from_string("wait for cpu"); - LTTV_STATE_EXIT = g_quark_from_string("exiting"); + LTTV_STATE_ZOMBIE = g_quark_from_string("zombie"); LTTV_STATE_WAIT = g_quark_from_string("wait for I/O"); LTTV_STATE_RUN = g_quark_from_string("running"); LTTV_STATE_TRACEFILES = g_quark_from_string("tracefiles"); diff --git a/ltt/branches/poly/lttv/lttv/state.h b/ltt/branches/poly/lttv/lttv/state.h index 9d1415a1..8c5a1eb0 100644 --- a/ltt/branches/poly/lttv/lttv/state.h +++ b/ltt/branches/poly/lttv/lttv/state.h @@ -125,7 +125,7 @@ extern LttvProcessStatus LTTV_STATE_UNNAMED, LTTV_STATE_WAIT_FORK, LTTV_STATE_WAIT_CPU, - LTTV_STATE_EXIT, + LTTV_STATE_ZOMBIE, LTTV_STATE_WAIT, LTTV_STATE_RUN; diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 38578cfc..91a09fce 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -40,7 +40,7 @@ GdkColor drawing_colors[NUM_COLORS] = { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_WHITE */ { 0, 0x0fff, 0xffff, 0xfff0 }, /* COL_WAIT_FORK */ { 0, 0xffff, 0xffff, 0x0000 }, /* COL_WAIT_CPU */ - { 0, 0xffff, 0x0000, 0xffff }, /* COL_EXIT */ + { 0, 0xffff, 0x0000, 0xffff }, /* COL_ZOMBIE */ { 0, 0xffff, 0x0000, 0x0000 }, /* COL_WAIT */ { 0, 0x0000, 0xffff, 0x0000 } /* COL_RUN */ }; diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h index 19da1678..02146cc8 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h @@ -38,7 +38,7 @@ typedef enum _draw_color { COL_BLACK, COL_WHITE, COL_WAIT_FORK, COL_WAIT_CPU, - COL_EXIT, + COL_ZOMBIE, COL_WAIT, COL_RUN, NUM_COLORS } draw_color; diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c index d458fe04..b72200a7 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -283,8 +283,8 @@ static __inline PropertiesLine prepare_line(LttvProcessState *process) prop_line.color = drawing_colors[COL_WAIT_FORK]; else if(process->state->s == LTTV_STATE_WAIT_CPU) prop_line.color = drawing_colors[COL_WAIT_CPU]; - else if(process->state->s == LTTV_STATE_EXIT) - prop_line.color = drawing_colors[COL_EXIT]; + else if(process->state->s == LTTV_STATE_ZOMBIE) + prop_line.color = drawing_colors[COL_ZOMBIE]; else if(process->state->s == LTTV_STATE_WAIT) prop_line.color = drawing_colors[COL_WAIT]; else if(process->state->s == LTTV_STATE_RUN) @@ -841,7 +841,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_out.foreground->green = 0xffff; prop_text_out.foreground->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_text_out.foreground->red = 0xffff; prop_text_out.foreground->green = 0x0000; @@ -874,7 +874,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_out.text = "WF->"; else if(process_out->state->s == LTTV_STATE_WAIT_CPU) prop_text_out.text = "WC->"; - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) prop_text_out.text = "E->"; else if(process_out->state->s == LTTV_STATE_WAIT) prop_text_out.text = "W->"; @@ -917,7 +917,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_line_out.color->green = 0xffff; prop_line_out.color->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_line_out.color->red = 0xffff; prop_line_out.color->green = 0x0000; @@ -1065,7 +1065,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_in.foreground->green = 0xffff; prop_text_in.foreground->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_text_in.foreground->red = 0xffff; prop_text_in.foreground->green = 0x0000; @@ -1099,7 +1099,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_in.text = "WF->"; else if(process_in->state->s == LTTV_STATE_WAIT_CPU) prop_text_in.text = "WC->"; - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) prop_text_in.text = "E->"; else if(process_in->state->s == LTTV_STATE_WAIT) prop_text_in.text = "W->"; @@ -1140,7 +1140,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_line_in.color->green = 0xffff; prop_line_in.color->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_line_in.color->red = 0xffff; prop_line_in.color->green = 0x0000; @@ -1522,7 +1522,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_out.foreground->green = 0xffff; prop_text_out.foreground->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_text_out.foreground->red = 0xffff; prop_text_out.foreground->green = 0x0000; @@ -1554,7 +1554,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_out.text = "WF"; else if(process_out->state->s == LTTV_STATE_WAIT_CPU) prop_text_out.text = "WC"; - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) prop_text_out.text = "E"; else if(process_out->state->s == LTTV_STATE_WAIT) prop_text_out.text = "W"; @@ -1663,7 +1663,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_in.foreground->green = 0xffff; prop_text_in.foreground->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_text_in.foreground->red = 0xffff; prop_text_in.foreground->green = 0x0000; @@ -1696,7 +1696,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_in.text = "WF"; else if(process_in->state->s == LTTV_STATE_WAIT_CPU) prop_text_in.text = "WC"; - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) prop_text_in.text = "E"; else if(process_in->state->s == LTTV_STATE_WAIT) prop_text_in.text = "W"; -- 2.34.1