summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d8d60f1)
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
)
def _eval_integer(d, expr):
)
def _eval_integer(d, expr):
- l = d._sp.stdin.readline()
- if l != '!\n': raise RuntimeError("indonor said %s" % repr(l))
- d._sp.stdout.write(expr + '\n')
- d._sp.stdout.flush()
- l = d._sp.stdin.readline().rstrip('\n')
+ l = d._sp.stdout.readline()
+ if l != b'!\n': raise RuntimeError("indonor said %s" % repr(l))
+ d._sp.stdin.write(expr.encode('utf-8') + b'\n')
+ d._sp.stdin.flush()
+ l = d._sp.stdout.readline().rstrip(b'\n')
return int(l)
def _eval_success(d, expr):
return int(l)
def _eval_success(d, expr):
import gdb
import copy
import os
import gdb
import copy
import os
def _string_escape_for_c(s):
out = ''
def _string_escape_for_c(s):
out = ''
else:
return v # should already be an integer
else:
return v # should already be an integer
+def parse_eval(expr):
+ sys.stderr.write("## EVAL %s\n" % repr(expr))
+ x = gdb.parse_and_eval(expr)
+ sys.stderr.write('## => %s\n' % x)
+ sys.stderr.flush()
+ return x
+
class DonorStructLayout():
def __init__(l, typename):
class DonorStructLayout():
def __init__(l, typename):
- x = gdb.parse_and_eval('(%s){ }' % typename)
+ x = parse_eval('(%s){ }' % typename)
l._typename = typename
l._template = [ ]
l._posns = { }
l._typename = typename
l._template = [ ]
l._posns = { }
try: f.type.fields(); blank = '{ }'
except AttributeError: blank = '0'
l._template.append(blank)
try: f.type.fields(); blank = '{ }'
except AttributeError: blank = '0'
l._template.append(blank)
def substitute(l, values):
build = copy.deepcopy(l._template)
for (k,v) in values.items():
def substitute(l, values):
build = copy.deepcopy(l._template)
for (k,v) in values.items():
def _func(di, functype, funcname, realargs):
expr = '((%s) %s) %s' % (functype, funcname, realargs)
def _func(di, functype, funcname, realargs):
expr = '((%s) %s) %s' % (functype, funcname, realargs)
- return gdb.parse_and_eval(expr)
+ return parse_eval(expr)
def _must_func(di, functype, funcname, realargs):
retval = di._func(functype, funcname, realargs)
if retval < 0:
def _must_func(di, functype, funcname, realargs):
retval = di._func(functype, funcname, realargs)
if retval < 0:
- errnoval = gdb.parse_and_eval('errno')
+ errnoval = parse_eval('errno')
raise RuntimeError("%s gave errno=%d `%s'" %
(funcname, errnoval, os.strerror(errnoval)))
raise RuntimeError("%s gave errno=%d `%s'" %
(funcname, errnoval, os.strerror(errnoval)))
# wrappers for the syscalls that do what we want
# wrappers for the syscalls that do what we want
'("%s", %d)' % (_string_escape_for_c(path), mode)
)
if r < 0:
'("%s", %d)' % (_string_escape_for_c(path), mode)
)
if r < 0:
- errnoval = gdb.parse_and_eval('errno')
+ errnoval = parse_eval('errno')
if errnoval != os.errno.EEXIST:
raise RuntimeError("mkdir %s failed: `%s'" %
(repr(path), os.strerror(errnoval)))
if errnoval != os.errno.EEXIST:
raise RuntimeError("mkdir %s failed: `%s'" %
(repr(path), os.strerror(errnoval)))
return 1
def _errno_save(di):
return 1
def _errno_save(di):
- di._saved_errno = gdb.parse_and_eval('errno')
+ di._saved_errno = parse_eval('errno')
def _errno_restore(di):
to_restore = di._saved_errno
di._saved_errno = None
if to_restore is not None:
def _errno_restore(di):
to_restore = di._saved_errno
di._saved_errno = None
if to_restore is not None:
- gdb.parse_and_eval('errno = %d' % to_restore)
+ parse_eval('errno = %d' % to_restore)
+ def _result(di, output):
+ sys.stderr.write("#> %s" % output)
+ di._result_stream.write(output)
+ di._result_stream.flush()
- def result(di, output):
- di._result_stram.write(output)
- di._result_stram.flush()
def donate(di, path, control_msg):
# control_msg is an array of integers being the ancillary data
def donate(di, path, control_msg):
# control_msg is an array of integers being the ancillary data
def mkdir(di, path):
try:
di._errno_save()
def mkdir(di, path):
try:
di._errno_save()
- val = di._mkdir(path, '0700')
+ val = di._mkdir(path, int('0700', 8))
finally:
di._errno_restore()
di._result('%d\n' % val)
def _protocol_read(di):
finally:
di._errno_restore()
di._result('%d\n' % val)
def _protocol_read(di):
- return sys.stdin.readline().rstrip('\n')
+ input = sys.stdin.readline().rstrip('\n')
+ sys.stderr.write("#< %s\n" % input)
+ return input
def eval_loop(di):
while True:
def eval_loop(di):
while True: