mirror of
https://github.com/joyieldInc/predixy.git
synced 2026-02-05 01:42:24 +08:00
Initialize thread pointer in logger
This commit is contained in:
parent
3146ae0adc
commit
13e36df7c8
@ -87,6 +87,7 @@ Logger::Logger(int maxLogUnitNum):
|
|||||||
mLogUnitCnt(0),
|
mLogUnitCnt(0),
|
||||||
mLogs(maxLogUnitNum),
|
mLogs(maxLogUnitNum),
|
||||||
mFree(maxLogUnitNum),
|
mFree(maxLogUnitNum),
|
||||||
|
mThread(nullptr),
|
||||||
mFileSink(nullptr)
|
mFileSink(nullptr)
|
||||||
{
|
{
|
||||||
mLogs.resize(0);
|
mLogs.resize(0);
|
||||||
|
|||||||
11
test/logger_thread_init.cpp
Normal file
11
test/logger_thread_init.cpp
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
/*
|
||||||
|
* Ensure Logger destructor is safe when thread was never started.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../src/Logger.h"
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
Logger* logger = new Logger();
|
||||||
|
delete logger;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
47
test/logger_thread_init.py
Normal file
47
test/logger_thread_init.py
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
|
# Build and run the Logger thread init test.
|
||||||
|
#
|
||||||
|
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from test_util import parse_args, exit_with_result
|
||||||
|
|
||||||
|
|
||||||
|
def run_test(project_root):
|
||||||
|
src = os.path.join(project_root, "test", "logger_thread_init.cpp")
|
||||||
|
if not os.path.exists(src):
|
||||||
|
print("FAIL: logger_thread_init.cpp not found")
|
||||||
|
return False
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
exe = os.path.join(tmp, "logger_thread_init")
|
||||||
|
cmd = [
|
||||||
|
"g++",
|
||||||
|
"-std=c++11",
|
||||||
|
src,
|
||||||
|
os.path.join(project_root, "src", "Logger.cpp"),
|
||||||
|
os.path.join(project_root, "src", "LogFileSink.cpp"),
|
||||||
|
os.path.join(project_root, "src", "Timer.cpp"),
|
||||||
|
"-o",
|
||||||
|
exe,
|
||||||
|
]
|
||||||
|
try:
|
||||||
|
subprocess.check_call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
except Exception as exc:
|
||||||
|
print("FAIL: compile logger_thread_init:", exc)
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
subprocess.check_call([exe], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
except subprocess.CalledProcessError as exc:
|
||||||
|
print("FAIL: logger_thread_init returned", exc.returncode)
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
_ = parse_args("Logger thread init test")
|
||||||
|
root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||||
|
success = run_test(root)
|
||||||
|
exit_with_result(success, "logger thread init", "logger thread init")
|
||||||
@ -147,6 +147,7 @@ TESTS=(
|
|||||||
"test/signal_handling.py"
|
"test/signal_handling.py"
|
||||||
"test/buffer_vsnprintf.py"
|
"test/buffer_vsnprintf.py"
|
||||||
"test/logunit_vsnprintf.py"
|
"test/logunit_vsnprintf.py"
|
||||||
|
"test/logger_thread_init.py"
|
||||||
"test/pubsub_long_name.py"
|
"test/pubsub_long_name.py"
|
||||||
"test/pubsub_large_message.py"
|
"test/pubsub_large_message.py"
|
||||||
"test/transaction_forbid.py"
|
"test/transaction_forbid.py"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user