Skip to content

Dev/cs01/general improvements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 8, 2016
Merged

Dev/cs01/general improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4679e5
use mi commands instead of regular gdb commands
Dec 6, 2016
a205c96
ensure file exists and better error handling
Dec 7, 2016
2443055
add moment file
Dec 7, 2016
afc283a
handle tables with similar data but non-overlapping columns
Dec 7, 2016
fbd0c21
add button to get delayed gdb response; add fixed top status bar
Dec 7, 2016
fc86a63
better history saving; choose from list of all source files
Dec 7, 2016
238f4af
improve source file selection
Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions gdbgui/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,23 @@ def run_gdb_command():
else:
return client_error({'message': 'gdb is not running'})

@app.route('/get_gdb_response')
def get_gdb_response():
if gdb is not None:
try:
response = gdb.get_gdb_response()
return jsonify(response)
except Exception as e:
return server_error({'message': str(e)})
else:
return client_error({'message': 'gdb is not running'})


@app.route('/read_file')
def read_file():
"""Used to get contents of source files that are being debugged"""
path = request.args.get('path')
if os.path.isfile(path):
if path and os.path.isfile(path):
try:
with open(path, 'r') as f:
return jsonify({'source_code': f.read().splitlines(),
Expand All @@ -85,7 +96,6 @@ def signal_handler(signal, frame):


def quit_backend():
global app, gdb
gdb.exit()
func = request.environ.get('werkzeug.server.shutdown')
if func is None:
Expand All @@ -102,7 +112,7 @@ def setup_backend(serve=True, port=5000, debug=False):
app.debug = debug
app.config['TEMPLATES_AUTO_RELOAD'] = True
if serve:
extra_files=[]
extra_files = []
for dirname, dirs, files in os.walk(TEMPLATE_DIR):
for filename in files:
filename = os.path.join(dirname, filename)
Expand Down
10 changes: 10 additions & 0 deletions gdbgui/static/css/gdbgui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,13 @@ pre{
border-width: 1px;
border-radius: 2px;
}
.dropdown-btn {
vertical-align: top;
height: 30px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.awesomplete ul {
overflow: auto;
max-height: 200px;
}
170 changes: 128 additions & 42 deletions gdbgui/static/js/gdbgui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"use strict";

const Util = {
get_table: function(thead, data) {
get_table: function(columns, data) {
var result = ["<table class='table table-striped table-bordered table-condensed'>"];
result.push("<thead>");
result.push("<tr>");
for (let h of thead){
for (let h of columns){
result.push(`<th>${h}</th>`);
}
result.push("</tr>");
Expand All @@ -23,9 +23,27 @@ const Util = {
result.push("</table>");
return result.join('\n');
},
get_table_data: function(objs){
// put keys of all objects into array
let all_keys = _.flatten(objs.map(i => _.keys(i)))
let columns = _.uniq(_.flatten(all_keys)).sort()

let data = []
for (let s of objs){
let row = []
for (let k of columns){
row.push(k in s ? s[k] : '')
}
data.push(row)
}
return [columns, data]
},
post_msg: function(data){
App.set_status(_.escape(data.responseJSON.message))
// Messenger().post(_.escape(data.responseJSON.message))
if (data.responseJSON && data.responseJSON.message){
App.set_status(_.escape(data.responseJSON.message))
}else{
App.set_status(`${data.statusText} (${data.status} error)`)
}
},
escape: function(s){
return s.replace(/([^\\]\\n)/g, '<br>')
Expand All @@ -42,6 +60,8 @@ const Consts = {

jq_gdb_command_input: $('#gdb_command'),
jq_binary: $('#binary'),
jq_source_file_input: $('#source_file_input'),
jq_source_files_datalist: $('#source_files_datalist'),
jq_code: $('#code_table'),
jq_code_container: $('#code_container'),
js_gdb_controls: $('.gdb_controls'),
Expand All @@ -62,32 +82,36 @@ let App = {
init: function(){
App.register_events();

Consts.jq_binary.val(localStorage.getItem('last_binary'))
try{
App.state.history = JSON.parse(localStorage.getItem('history'))
App.state.past_binaries = _.uniq(JSON.parse(localStorage.getItem('past_binaries')))
Consts.jq_binary.val(App.state.past_binaries[0])
} catch(err){
App.state.past_binaries = []
}
App.render_past_binary_options_datalist()

try{
App.state.history = _.uniq(JSON.parse(localStorage.getItem('history')))
}catch(err){
App.state.history = []
}
if (_.isArray(App.state.history)){
App.state.history.map(App.show_in_history_table)
}
App.render_history_table()
},
onclose: function(){
console.log(JSON.stringify(App.state.history))
console.log(JSON.stringify(App.state.history))
console.log(JSON.stringify(App.state.history))
localStorage.setItem('last_binary', Consts.jq_binary.val())
localStorage.setItem('history', JSON.stringify(App.state.history))
localStorage.setItem('past_binaries', JSON.stringify(App.state.past_binaries) || [])
localStorage.setItem('history', JSON.stringify(App.state.history) || [])
return null
},
set_status: function(status){
Consts.jq_status.text(status)
},
state: {'breakpoints': [], // list of breakpoints
'source_files': [], // list of absolute paths, and their contents
'source_files': [], // list of absolute paths
'cached_source_files': [], // list of absolute paths, and their source code
'frame': {}, // current "frame" in gdb. Has keys: line, fullname (path to file), among others.
'rendered_source_file': {'fullname': null, 'line': null}, // current source file displayed
'history': []
'history': [],
'past_binaries': [],
},
clear_state: function(){
App.state = {
Expand All @@ -114,13 +138,45 @@ let App = {
}
);
$('.gdb_cmd').click(function(e){App.click_gdb_cmd_button(e)});
Consts.jq_source_file_input.keyup(function(e){App.keyup_source_file_input(e)});
$('.clear_history').click(function(e){App.clear_history(e)});
$('.clear_console').click(function(e){App.clear_console(e)});
$('.get_gdb_response').click(function(e){App.get_gdb_response(e)});
$("body").on("click", ".breakpoint", App.click_breakpoint);
$("body").on("click", ".no_breakpoint", App.click_source_file_gutter_with_no_breakpoint);
$("body").on("click", ".sent_command", App.click_sent_command);
$("body").on("click", ".resizer", App.click_resizer_button);

Consts.jq_refresh_disassembly_button.click(App.refresh_disassembly);
App.init_autocomplete()


},
init_autocomplete: function(){

App.autocomplete_source_file_input = new Awesomplete('#source_file_input', {
minChars: 0,
maxItems: 10000,
list: [],
sort: (a,b ) => {return a < b ? -1 : 1;}
});

Awesomplete.$('.dropdown-btn').addEventListener("click", function() {
if (App.autocomplete_source_file_input.ul.childNodes.length === 0) {
App.autocomplete_source_file_input.minChars = 0;
App.autocomplete_source_file_input.evaluate();
}
else if (App.autocomplete_source_file_input.ul.hasAttribute('hidden')) {
App.autocomplete_source_file_input.open();
}
else {
App.autocomplete_source_file_input.close();
}
})

Awesomplete.$('#source_file_input').addEventListener('awesomplete-selectcomplete', function(e){
App.read_and_render_file(e.currentTarget.value)
});

},
refresh_disassembly: function(e){
Expand All @@ -137,8 +193,13 @@ let App = {
},
click_set_target_app_button: function(e){
var binary = Consts.jq_binary.val();
App.run_gdb_command(`file ${binary}`);
App.enable_gdb_controls();
_.remove(App.state.past_binaries, i => i === binary)
App.state.past_binaries.unshift(binary)
App.render_past_binary_options_datalist()
App.run_gdb_command(`-file-exec-and-symbols ${binary}`);
},
render_past_binary_options_datalist: function(){
$('#past_binaries').html(App.state.past_binaries.map(b => `<option>${b}</option`))
},
keydown_on_binary_input: function(e){
if(e.keyCode === 13) {
Expand All @@ -163,7 +224,6 @@ let App = {
}
},
click_resizer_button: function(e){
console.log(e)
let jq_selection = $(e.currentTarget.dataset['target_selector'])
let cur_height = jq_selection.height()
if (e.currentTarget.dataset['resize_type'] === 'enlarge'){
Expand Down Expand Up @@ -205,9 +265,9 @@ let App = {
return
}

App.set_status('')
App.set_status(`running command "${cmd}"`)
App.save_to_history(cmd)
App.show_in_history_table(cmd)
App.render_history_table()
$.ajax({
url: "/run_gdb_command",
cache: false,
Expand All @@ -217,6 +277,15 @@ let App = {
error: Util.post_msg
})
},
get_gdb_response: function(){
App.set_status(`Getting GDB response`)
$.ajax({
url: "/get_gdb_response",
cache: false,
success: App.receive_gdb_response,
error: Util.post_msg
})
},
clear_history: function(){
App.state.history = []
Consts.jq_command_history.html('')
Expand All @@ -226,13 +295,15 @@ let App = {
},
save_to_history: function(cmd){
if (_.isArray(App.state.history)){
App.state.history.push(cmd)
_.remove(App.state.history, i => i === cmd)
App.state.history.unshift(cmd)
}else{
App.state.history = [cmd]
}
},
show_in_history_table: function(cmd){
Consts.jq_command_history.prepend(`<tr><td class="sent_command pointer" data-cmd="${cmd}" style="padding: 0">${cmd}</td></tr>`)
render_history_table: function(){
let history_html = App.state.history.map(cmd => `<tr><td class="sent_command pointer" data-cmd="${cmd}" style="padding: 0">${cmd}</td></tr>`)
Consts.jq_command_history.html(history_html)
},
receive_gdb_response: function(response_array){
const text_class = {
Expand Down Expand Up @@ -274,14 +345,21 @@ let App = {
App.render_cached_source_file();
} else if ('stack' in r.payload) {
App.render_stack(r.payload.stack)

} else if ('register-values' in r.payload) {
if (App.register_names){
App.render_registers(App.register_names, r.payload['register-values'])
}
} else if ('register-names' in r.payload) {
App.register_names = r.payload['register-names']

} else if ('asm_insns' in r.payload) {
App.render_disasembly(r.payload.asm_insns)

} else if ('files' in r.payload){
App.source_files = _.uniq(r.payload.files.map(f => f.fullname)).sort()
App.autocomplete_source_file_input.list = App.source_files
App.autocomplete_source_file_input.evaluate()
}

} else if (r.payload && typeof r.payload.frame !== 'undefined') {
Expand All @@ -307,20 +385,30 @@ let App = {
if (r.message){
status.push(r.message)
}
if (r.payload && r.payload.msg){
status.push(r.payload.msg)
}
if (r.payload && r.payload.reason){
status.push(r.payload.reason)
if (r.payload){
if (r.payload.msg) {status.push(r.payload.msg)}
if (r.payload.reason) {status.push(r.payload.reason)}
if (r.payload.frame){
for(let i of ['file', 'func', 'line']){
if (i in r.payload.frame){
status.push(`${i}: ${r.payload.frame[i]}`)
}
}
}
}
App.set_status(status.join('. '))
App.set_status(status.join(', '))
}

// scroll to the bottom
Consts.jq_stdout.animate({'scrollTop': Consts.jq_stdout.prop('scrollHeight')})
Consts.jq_gdb_mi_output.animate({'scrollTop': Consts.jq_gdb_mi_output.prop('scrollHeight')})
Consts.jq_console.animate({'scrollTop': Consts.jq_console.prop('scrollHeight')})
},
keyup_source_file_input: function(e){
if (e.keyCode === 13){
App.read_and_render_file(e.currentTarget.value)
}
},
render_disasembly: function(asm_insns){
let thead = [ 'line', 'function+offset address instruction']
let data = []
Expand All @@ -332,23 +420,22 @@ let App = {
Consts.jq_disassembly_heading.html(asm_insns['fullname'])
},
render_stack: function(stack){
let thead = _.keys(stack[0])
let stack_array = stack.map(b => _.values(b));
Consts.jq_stack.html(Util.get_table(thead, stack_array));
let [columns, data] = Util.get_table_data(stack)
Consts.jq_stack.html(Util.get_table(columns, data));
},
render_registers(names, values){
let thead = ['name', 'value']
let columns = ['name', 'value']
let register_array = values.map(v => [names[v['number']], v['value']]);
Consts.jq_registers.html(Util.get_table(thead, register_array));
Consts.jq_registers.html(Util.get_table(columns, register_array));
},
read_and_render_file: function(fullname, highlight_line=0){
if (fullname === null){
if (fullname === null || fullname === undefined){
return
}

if (App.state.source_files.some(f => f.fullname === fullname)){
if (App.state.cached_source_files.some(f => f.fullname === fullname)){
// We have this cached locally, just use it!
let f = _.find(App.state.source_files, i => i.fullname === fullname);
let f = _.find(App.state.cached_source_files, i => i.fullname === fullname);
App.render_source_file(fullname, f.source_code, highlight_line);
return
}
Expand All @@ -359,7 +446,7 @@ let App = {
type: 'GET',
data: {path: fullname},
success: function(response){
App.state.source_files.push({'fullname': fullname, 'source_code': response.source_code})
App.state.cached_source_files.push({'fullname': fullname, 'source_code': response.source_code})
App.render_source_file(fullname, response.source_code, highlight_line);
},
error: Util.post_msg
Expand Down Expand Up @@ -407,9 +494,8 @@ let App = {
App.state.breakpoints.push(breakpoint);
},
render_breakpoint_table: function(){
const thead = _.keys(App.state.breakpoints[0]);
let bkpt_array = App.state.breakpoints.map(b => _.values(b));
Consts.jq_breakpoints.html(Util.get_table(thead, bkpt_array));
let [columns, data] = Util.get_table_data(App.state.breakpoints)
Consts.jq_breakpoints.html(Util.get_table(columns, data))
},
enable_gdb_controls: function(){
Consts.js_gdb_controls.removeClass('disabled');
Expand Down
Loading