xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Finished refactoring crash_gen tool into a Python modular structure

This commit is contained in:
Steven Li 2020-10-21 00:18:49 +00:00
parent c6a5706f66
commit e011827fd4
3 changed files with 135 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/pytest/crash_gen.sh
View File

@ -54,6 +54,7 @@ export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3:$(pwd)
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
# Now we are all let, and let's see if we can find a crash. Note we pass all params # Now we are all let, and let's see if we can find a crash. Note we pass all params
CRASH_GEN_EXEC=crash_gen_bootstrap.py
if [[ $1 == '--valgrind' ]]; then if [[ $1 == '--valgrind' ]]; then
shift shift
export PYTHONMALLOC=malloc export PYTHONMALLOC=malloc
@ -66,14 +67,14 @@ if [[ $1 == '--valgrind' ]]; then
--leak-check=yes \ --leak-check=yes \
--suppressions=crash_gen/valgrind_taos.supp \ --suppressions=crash_gen/valgrind_taos.supp \
$PYTHON_EXEC \ $PYTHON_EXEC \
./crash_gen/crash_gen.py $@ > $VALGRIND_OUT 2> $VALGRIND_ERR $CRASH_GEN_EXEC $@ > $VALGRIND_OUT 2> $VALGRIND_ERR
elif [[ $1 == '--helgrind' ]]; then elif [[ $1 == '--helgrind' ]]; then
shift shift
valgrind \ valgrind \
--tool=helgrind \ --tool=helgrind \
$PYTHON_EXEC \ $PYTHON_EXEC \
./crash_gen/crash_gen.py $@ $CRASH_GEN_EXEC $@
else else
$PYTHON_EXEC ./crash_gen/crash_gen.py $@ $PYTHON_EXEC $CRASH_GEN_EXEC $@
fi fi

19
tests/pytest/crash_gen/crash_gen.py
View File

@ -3160,9 +3160,10 @@ class MainExec:
self._svcMgr = None self._svcMgr = None
gSvcMgr = None gSvcMgr = None
def init(self): # TODO: refactor
global gContainer
gContainer = Container() # micky-mouse DI
def main():
# Super cool Python argument library: # Super cool Python argument library:
# https://docs.python.org/3/library/argparse.html # https://docs.python.org/3/library/argparse.html
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
@ -3271,12 +3272,12 @@ def main():
Dice.seed(0) # initial seeding of dice Dice.seed(0) # initial seeding of dice
# Run server or client def run(self):
mExec = MainExec()
if gConfig.run_tdengine: # run server if gConfig.run_tdengine: # run server
mExec.runService() self.runService()
else: else:
return mExec.runClient() return self.runClient()
class Container(): class Container():
_propertyList = {'defTdeInstance'} _propertyList = {'defTdeInstance'}
@ -3300,9 +3301,3 @@ class Container():
self._verifyValidProperty(name) self._verifyValidProperty(name)
self._cargo[name] = value self._cargo[name] = value
if __name__ == "__main__":
gContainer = Container() # micky-mouse DI
exitCode = main()
# print("Exiting with code: {}".format(exitCode))
sys.exit(exitCode)

23
tests/pytest/crash_gen_bootstrap.py Normal file
View File

@ -0,0 +1,23 @@
# -----!/usr/bin/python3.7
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
import sys
from crash_gen.crash_gen import MainExec
if __name__ == "__main__":
mExec = MainExec()
mExec.init()
exitCode = mExec.run()
print("Exiting with code: {}".format(exitCode))
sys.exit(exitCode)