ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory debugging

This commit is contained in:
Allen Webster 2016-06-07 16:12:23 -04:00
parent 412ad98864
commit 368e79e78c
5 changed files with 187 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
4coder_mem.h
View File

@ -72,4 +72,5 @@ end_temp_memory(Temp_Memory temp){
((Partition*)temp.handle)->pos = temp.pos; ((Partition*)temp.handle)->pos = temp.pos;
} }
#endif #endif

18
4coder_string.h
View File

@ -181,6 +181,8 @@ FSTRING_INLINE fstr_bool terminate_with_null(String *str){
return result; return result;
} }
FSTRING_LINK fstr_bool append_padding(String *dest, char c, int32_t target_size);
FSTRING_LINK int32_t compare(char *a, char *b); FSTRING_LINK int32_t compare(char *a, char *b);
FSTRING_LINK int32_t compare(String a, char *b); FSTRING_LINK int32_t compare(String a, char *b);
FSTRING_INLINE int32_t compare(char *a, String b) { return -compare(b,a); } FSTRING_INLINE int32_t compare(char *a, String b) { return -compare(b,a); }
@ -1023,6 +1025,22 @@ append(String *dest, char c){
return result; return result;
} }
FSTRING_LINK fstr_bool
append_padding(String *dest, char c, int32_t target_size){
fstr_bool result = 1;
int32_t offset = target_size - dest->size;
int32_t r;
if (offset > 0){
for (r = 0; r < offset; ++r){
if (append(dest, c) == 0){
result = 0;
break;
}
}
}
return(result);
}
FSTRING_LINK int32_t FSTRING_LINK int32_t
compare(char *a, char *b){ compare(char *a, char *b){
int32_t i = 0; int32_t i = 0;

4
4ed.cpp
View File

@ -1247,7 +1247,10 @@ COMMAND_DECL(open_menu){
COMMAND_DECL(open_debug){ COMMAND_DECL(open_debug){
USE_VIEW(view); USE_VIEW(view);
#if FRED_INTERNAL
view_show_GUI(view, VUI_Debug); view_show_GUI(view, VUI_Debug);
view->debug_mode = DBG_Input;
#endif
} }
COMMAND_DECL(user_callback){ COMMAND_DECL(user_callback){
@ -1523,6 +1526,7 @@ COMMAND_DECL(command_line){
if (bind_to_new_view){ if (bind_to_new_view){
view_set_file(view, file, models); view_set_file(view, file, models);
view_show_file(view);
} }
proc = procs + vars->cli_processes.count++; proc = procs + vars->cli_processes.count++;

255
4ed_file_view.cpp
View File

@ -130,6 +130,11 @@ enum View_UI{
VUI_Debug VUI_Debug
}; };
enum Debug_Mode{
DBG_Input,
DBG_Memory
};
enum Color_View_Mode{ enum Color_View_Mode{
CV_Mode_Library, CV_Mode_Library,
CV_Mode_Font, CV_Mode_Font,
@ -259,6 +264,8 @@ struct View{
f32 widget_height; f32 widget_height;
b32 reinit_scrolling; b32 reinit_scrolling;
Debug_Mode debug_mode;
}; };
inline void* inline void*
get_view_body(View *view){ get_view_body(View *view){
@ -3906,7 +3913,9 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
gui_begin_top_level(target, input); gui_begin_top_level(target, input);
{ {
gui_do_top_bar(target); if (view->showing_ui != VUI_Debug){
gui_do_top_bar(target);
}
do_widget(view, target); do_widget(view, target);
if (view->showing_ui == VUI_None){ if (view->showing_ui == VUI_None){
@ -4392,43 +4401,43 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
copy(&comp_dest, file->name.live_name); copy(&comp_dest, file->name.live_name);
} }
} }
end_temp_memory(temp); end_temp_memory(temp);
} }
gui_end_list(target); gui_end_list(target);
gui_end_scrollable(target); gui_end_scrollable(target);
}break; }break;
case IInt_Sure_To_Close: case IInt_Sure_To_Close:
{ {
i32 action = -1; i32 action = -1;
String empty_str = {0}; String empty_str = {0};
String message = make_lit_string("There is one or more files unsaved changes, close anyway?"); String message = make_lit_string("There is one or more files unsaved changes, close anyway?");
gui_do_text_field(target, message, empty_str); gui_do_text_field(target, message, empty_str);
id.id[0] = (u64)('y'); id.id[0] = (u64)('y');
message = make_lit_string("(Y)es"); message = make_lit_string("(Y)es");
if (gui_do_fixed_option(target, id, message, 'y')){ if (gui_do_fixed_option(target, id, message, 'y')){
action = 0; action = 0;
} }
id.id[0] = (u64)('n'); id.id[0] = (u64)('n');
message = make_lit_string("(N)o"); message = make_lit_string("(N)o");
if (gui_do_fixed_option(target, id, message, 'n')){ if (gui_do_fixed_option(target, id, message, 'n')){
action = 1; action = 1;
} }
if (action != -1){ if (action != -1){
complete = 1; complete = 1;
copy(&comp_dest, view->dest); copy(&comp_dest, view->dest);
comp_action = action; comp_action = action;
} }
}break; }break;
case IInt_Sure_To_Kill: case IInt_Sure_To_Kill:
{ {
i32 action = -1; i32 action = -1;
@ -4473,15 +4482,19 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
#if FRED_INTERNAL #if FRED_INTERNAL
case VUI_Debug: case VUI_Debug:
{ {
GUI_id scroll_context = {0};
scroll_context.id[1] = VUI_Debug + ((u64)view->interaction << 32);
view->current_scroll = &view->gui_scroll; view->current_scroll = &view->gui_scroll;
// TODO(allen): // TODO(allen):
// - Incoming input // + Incoming input
// - Memory info // + Memory info
// - Thread info // - Thread info
// - View inspection // - View inspection
// - Buffer inspection // - Buffer inspection
// - Command maps inspection // - Command maps inspection
// - Clipboard
String empty_str = string_zero(); String empty_str = string_zero();
@ -4499,97 +4512,149 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
gui_do_text_field(target, string, empty_str); gui_do_text_field(target, string, empty_str);
} }
// Incoming input
// - convert mouse clicks into key coded events??!!
{ {
Debug_Data *debug = &view->persistent.models->debug; Debug_Mode prev_mode = view->debug_mode;
for (i32 i = 0; i < keys.count; ++i){
{ Key_Event_Data key = get_single_key(&keys, i);
int mx = input.mouse.x;
int my = input.mouse.y;
string.size = 0; if (key.modifiers[MDFR_CONTROL_INDEX] == 0 &&
append(&string, "mouse: ("); key.modifiers[MDFR_ALT_INDEX] == 0){
append_int_to_str(&string, mx); if (key.keycode == 'i'){
append(&string, ","); view->debug_mode = DBG_Input;
append_int_to_str(&string, my); }
append(&string, ")"); if (key.keycode == 'm'){
view->debug_mode = DBG_Memory;
}
}
} }
if (prev_mode != view->debug_mode){
gui_do_text_field(target, string, empty_str); result.consume_keys = 1;
}
Debug_Input_Event *input_event = debug->input_events; }
for (i32 i = 0;
i < ArrayCount(debug->input_events); gui_begin_scrollable(target, scroll_context, view->gui_scroll,
++i, ++input_event){ 9.f * view->line_height, show_scrollbar);
string.size = 0;
switch (view->debug_mode)
{
case DBG_Input:
{
Debug_Data *debug = &view->persistent.models->debug;
if (input_event->is_hold){ {
append(&string, "hold: "); int mx = input.mouse.x;
} int my = input.mouse.y;
else{
append(&string, "press: ");
}
if (input_event->is_ctrl){
append(&string, "ctrl-");
}
else{
append(&string, " -");
}
if (input_event->is_alt){
append(&string, "alt-");
}
else{
append(&string, " -");
}
if (input_event->is_shift){
append(&string, "shift ");
}
else{
append(&string, " ");
}
if (input_event->key > ' ' && input_event->key <= '~'){
append(&string, make_string(&input_event->key, 1));
}
else if (input_event->key == ' '){
append(&string, "space");
}
else if (input_event->key == '\n'){
append(&string, "\\n");
}
else if (input_event->key == '\t'){
append(&string, "\\t");
}
else{
String str;
str.str = global_key_name(input_event->key, &str.size);
if (str.str){
str.memory_size = str.size + 1;
append(&string, str);
}
else{
append(&string, "unrecognized!");
}
}
if (input_event->consumer[0] != 0){
i32 next_pos = 40;
i32 offset = next_pos - string.size;
if (offset < 0) offset = 0;
for (i32 r = 0; r < offset; ++r){
append(&string, ' ');
}
append(&string, input_event->consumer); string.size = 0;
append(&string, "mouse: (");
append_int_to_str(&string, mx);
append(&string, ",");
append_int_to_str(&string, my);
append(&string, ")");
} }
gui_do_text_field(target, string, empty_str); gui_do_text_field(target, string, empty_str);
}
Debug_Input_Event *input_event = debug->input_events;
for (i32 i = 0;
i < ArrayCount(debug->input_events);
++i, ++input_event){
string.size = 0;
if (input_event->is_hold){
append(&string, "hold: ");
}
else{
append(&string, "press: ");
}
if (input_event->is_ctrl){
append(&string, "ctrl-");
}
else{
append(&string, " -");
}
if (input_event->is_alt){
append(&string, "alt-");
}
else{
append(&string, " -");
}
if (input_event->is_shift){
append(&string, "shift ");
}
else{
append(&string, " ");
}
if (input_event->key > ' ' && input_event->key <= '~'){
append(&string, make_string(&input_event->key, 1));
}
else if (input_event->key == ' '){
append(&string, "space");
}
else if (input_event->key == '\n'){
append(&string, "\\n");
}
else if (input_event->key == '\t'){
append(&string, "\\t");
}
else{
String str;
str.str = global_key_name(input_event->key, &str.size);
if (str.str){
str.memory_size = str.size + 1;
append(&string, str);
}
else{
append(&string, "unrecognized!");
}
}
if (input_event->consumer[0] != 0){
append_padding(&string, ' ', 40);
append(&string, input_event->consumer);
}
gui_do_text_field(target, string, empty_str);
}
}break;
case DBG_Memory:
{
Partition *part = &models->mem.part;
General_Memory *general = &models->mem.general;
string.size = 0;
append(&string, "part memory: ");
append_int_to_str(&string, part->pos);
append(&string, "/");
append_int_to_str(&string, part->max);
gui_do_text_field(target, string, empty_str);
Bubble *bubble, *sentinel;
sentinel = &general->sentinel;
for (dll_items(bubble, sentinel)){
string.size = 0;
if (bubble->flags & MEM_BUBBLE_USED){
append(&string, " used: ");
}
else{
append(&string, " free: ");
}
append_int_to_str(&string, bubble->size);
append_padding(&string, ' ', 40);
append(&string, " type: ");
append_int_to_str(&string, bubble->type);
gui_do_text_field(target, string, empty_str);
}
}break;
} }
gui_end_scrollable(target);
}break; }break;
#endif #endif
} }

6
4ed_gui.cpp
View File

@ -1141,19 +1141,19 @@ gui_interpret(GUI_Target *target, GUI_Session *session, GUI_Header *h,
gui_scrollbar_bottom(session->scroll_rect, &rect); gui_scrollbar_bottom(session->scroll_rect, &rect);
scroll_v = 0; scroll_v = 0;
break; break;
case guicom_begin_scrollable_section: case guicom_begin_scrollable_section:
always_give_to_user = 1; always_give_to_user = 1;
session->scrollable_items_bottom = 0; session->scrollable_items_bottom = 0;
rect = gui_layout_top_bottom(session, y, session->full_rect.y1); rect = gui_layout_top_bottom(session, y, session->full_rect.y1);
end_v = rect.y1; end_v = rect.y1;
break; break;
case guicom_end_scrollable_section: case guicom_end_scrollable_section:
always_give_to_user = 1; always_give_to_user = 1;
session->suggested_max_y = session->suggested_max_y =
(f32)(session->scrollable_items_bottom - (f32)(session->scrollable_items_bottom -
session->full_rect.y1 * .5f); (session->full_rect.y0 + session->full_rect.y1)*.5f);
if (session->suggested_max_y < 0){ if (session->suggested_max_y < 0){
session->suggested_max_y = 0; session->suggested_max_y = 0;
} }