proj: Small fixes
This commit is contained in:
@@ -285,11 +285,12 @@ class Handler(StreamRequestHandler):
|
||||
|
||||
|
||||
class MemoryAllocationTester(Handler):
|
||||
allocated: dict[int, int]
|
||||
allocated: dict[int, tuple[str, int, int]]
|
||||
max_allocated: int
|
||||
num_malloc: int
|
||||
num_realloc: int
|
||||
num_free: int
|
||||
num_invalid_free: int
|
||||
|
||||
def before(self):
|
||||
self.allocated = {}
|
||||
@@ -297,54 +298,60 @@ class MemoryAllocationTester(Handler):
|
||||
self.num_malloc = 0
|
||||
self.num_realloc = 0
|
||||
self.num_free = 0
|
||||
self.num_invalid_free = 0
|
||||
|
||||
def after(self):
|
||||
if len(self.allocated) > 0:
|
||||
print("Not free'd:")
|
||||
for ptr, size in self.allocated.items():
|
||||
print(f' 0x{ptr:x}: {size} bytes')
|
||||
for ptr, (func, ret, size) in self.allocated.items():
|
||||
print(f' 0x{ptr:x}: {size} bytes ({func}, return address 0x{ret:x})')
|
||||
else:
|
||||
print("All blocks free'd!")
|
||||
print(f'Max allocated: {self.max_allocated} bytes')
|
||||
|
||||
def update_max_allocated(self):
|
||||
total = sum(self.allocated.values())
|
||||
total = sum(a[2] for a in self.allocated.values())
|
||||
if total > self.max_allocated:
|
||||
self.max_allocated = total
|
||||
|
||||
def after_malloc(self, size, ret_value, errno=None) -> None:
|
||||
self.num_malloc += 1
|
||||
if ret_value != 0:
|
||||
print(ret_value)
|
||||
self.allocated[ret_value] = size
|
||||
self.allocated[ret_value] = ('malloc', self.ret_addr, size)
|
||||
self.update_max_allocated()
|
||||
|
||||
def after_calloc(self, nmemb, size, ret_value, errno=None) -> None:
|
||||
self.num_malloc += 1
|
||||
if ret_value != 0:
|
||||
self.allocated[ret_value] = nmemb * size
|
||||
self.allocated[ret_value] = ('calloc', self.ret_addr, nmemb * size)
|
||||
self.update_max_allocated()
|
||||
|
||||
def after_realloc(self, ptr, size, ret_value, errno=None) -> None:
|
||||
self.num_realloc += 1
|
||||
if ptr != 0:
|
||||
if ret_value != 0:
|
||||
v = self.allocated[ptr]
|
||||
del self.allocated[ptr]
|
||||
self.allocated[ret_value] = size
|
||||
self.allocated[ret_value] = (v[0], v[1], size)
|
||||
self.update_max_allocated()
|
||||
|
||||
def after_reallocarray(self, ptr, nmemb, size, ret_value, errno=None) -> None:
|
||||
self.num_realloc += 1
|
||||
if ptr != 0:
|
||||
if ret_value != 0:
|
||||
v = self.allocated[ptr]
|
||||
del self.allocated[ptr]
|
||||
self.allocated[ret_value] = nmemb * size
|
||||
self.allocated[ret_value] = (v[0], v[1], nmemb * size)
|
||||
self.update_max_allocated()
|
||||
|
||||
def after_free(self, ptr) -> None:
|
||||
self.num_free += 1
|
||||
if ptr != 0:
|
||||
del self.allocated[ptr]
|
||||
if ptr in self.allocated:
|
||||
del self.allocated[ptr]
|
||||
else:
|
||||
self.num_free -= 1
|
||||
self.num_invalid_free += 1
|
||||
|
||||
|
||||
class ReturnValueCheckTester(Handler):
|
||||
@@ -353,6 +360,13 @@ class ReturnValueCheckTester(Handler):
|
||||
|
||||
class InterruptedCheckTester(Handler):
|
||||
cycles: int = 50
|
||||
functions: dict[str, tuple[str or None, str]] = {
|
||||
'sem_wait': ('fail EINTR', 'return 0'),
|
||||
'sem_trywait': ('fail EINTR', 'return 0'),
|
||||
'sem_timedwait': ('fail EINTR', 'return 0'),
|
||||
'sem_post': (None, 'return 0'),
|
||||
}
|
||||
|
||||
counter: int = 0
|
||||
last_func_name: Optional[str] = None
|
||||
last_ret_addr: Optional[int] = None
|
||||
@@ -378,49 +392,25 @@ class InterruptedCheckTester(Handler):
|
||||
self.last_func_name = None
|
||||
self.last_ret_addr = None
|
||||
|
||||
def after_fallback(self, func_name: str, *args, **kwargs) -> None:
|
||||
if self.while_testing and self.last_func_name != func_name:
|
||||
self.error()
|
||||
|
||||
def before_sem_wait(self, sem: int) -> str:
|
||||
if self.last_ret_addr and self.last_ret_addr != self.ret_addr:
|
||||
def before_fallback(self, func_name: str, *args) -> str:
|
||||
if self.while_testing and (self.last_func_name != func_name or self.last_ret_addr != self.ret_addr):
|
||||
self.error()
|
||||
return 'ok'
|
||||
elif func_name not in self.functions:
|
||||
return 'ok'
|
||||
elif self.functions[func_name][0] is None:
|
||||
return self.functions[func_name][1]
|
||||
self.counter += 1
|
||||
if self.while_testing:
|
||||
self.last_ret_addr = self.ret_addr
|
||||
self.last_func_name = 'sem_wait'
|
||||
self.last_func_name = func_name
|
||||
self.tested_functions[(self.last_func_name, self.last_ret_addr)] = 'running'
|
||||
return 'fail EINTR'
|
||||
return self.functions[func_name][0]
|
||||
else:
|
||||
self.tested_functions[(self.last_func_name, self.last_ret_addr)] = 'passed'
|
||||
self.last_ret_addr = None
|
||||
self.last_func_name = None
|
||||
return 'return 0'
|
||||
|
||||
def before_sem_trywait(self, sem: int) -> str:
|
||||
self.counter += 1
|
||||
if self.while_testing:
|
||||
self.last_ret_addr = self.ret_addr
|
||||
self.last_func_name = 'sem_trywait'
|
||||
return 'fail EINTR'
|
||||
else:
|
||||
self.last_ret_addr = None
|
||||
self.last_func_name = None
|
||||
return 'return 0'
|
||||
|
||||
def before_sem_timedwait(self, sem: int, abs_timeout: Pointer[StructTimeSpec]) -> str:
|
||||
self.counter += 1
|
||||
if self.while_testing:
|
||||
self.last_ret_addr = self.ret_addr
|
||||
self.last_func_name = 'sem_timedwait'
|
||||
return 'fail EINTR'
|
||||
else:
|
||||
self.last_ret_addr = None
|
||||
self.last_func_name = None
|
||||
return 'return 0'
|
||||
|
||||
def before_sem_post(self, sem: int) -> str:
|
||||
return 'return 0'
|
||||
return self.functions[func_name][1]
|
||||
|
||||
|
||||
def intercept(socket: str, handler: type[Handler]) -> None:
|
||||
|
||||
@@ -39,7 +39,7 @@ def main() -> None:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('socket', metavar='FILE')
|
||||
args = parser.parse_args()
|
||||
intercept.intercept(args.socket, intercept.InterruptedCheckTester)
|
||||
intercept.intercept(args.socket, intercept.MemoryAllocationTester)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user