提交 e3cfa030 编写于 作者: L linyuanjin

add console build option

上级 62bec482
......@@ -244,6 +244,10 @@ ifeq ($(TERARKDB_ENABLE_METRICS),1)
OPT += -DTERARKDB_ENABLE_METRICS
endif
ifeq ($(TERARKDB_ENABLE_CONSOLE),1)
OPT += -DTERARKDB_ENABLE_CONSOLE
endif
#-----------------------------------------------
include src.mk
......
......@@ -22,6 +22,11 @@ if [ "$ENABLE_METRICS_BUILD" == "0" ]; then
TERARKDB_ENABLE_METRICS=0
fi
TERARKDB_ENABLE_CONSOLE=1
if [ "$ENABLE_CONSOLE_BUILD" == "0" ]; then
TERARKDB_ENABLE_CONSOLE=0
fi
if [ `uname` == Darwin ]; then
cpuNum=`sysctl -n machdep.cpu.thread_count`
else
......@@ -53,6 +58,7 @@ make LINK_TERARK=static \
BMI2=$WITH_BMI2 \
DISABLE_WARNING_AS_ERROR=1 \
TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
PORTABLE=$PORTABLE \
DEBUG_LEVEL=0 shared_lib -j $cpuNum
......@@ -61,6 +67,7 @@ make LINK_TERARK=static \
BMI2=$WITH_BMI2 \
DISABLE_WARNING_AS_ERROR=1 \
TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
PORTABLE=$PORTABLE \
DEBUG_LEVEL=1 shared_lib -j $cpuNum
......@@ -69,6 +76,7 @@ make LINK_TERARK=static \
BMI2=$WITH_BMI2 \
DISABLE_WARNING_AS_ERROR=1 \
TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
PORTABLE=$PORTABLE \
DEBUG_LEVEL=2 shared_lib -j $cpuNum
......@@ -78,6 +86,7 @@ make LINK_TERARK=static \
BMI2=$WITH_BMI2 \
DISABLE_WARNING_AS_ERROR=1 \
TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
PORTABLE=$PORTABLE \
DEBUG_LEVEL=0 static_lib -j $cpuNum
......@@ -86,6 +95,7 @@ make LINK_TERARK=static \
BMI2=$WITH_BMI2 \
DISABLE_WARNING_AS_ERROR=1 \
TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
PORTABLE=$PORTABLE \
DEBUG_LEVEL=2 static_lib -j $cpuNum
......
......@@ -138,6 +138,7 @@ static void ServerCron(long *last_cron_time, long curr_time,
int ServerMain(ServerRunner *runner, rocksdb::DBImpl *db,
const std::string &path, Env *env, Logger *log) {
#ifdef TERARKDB_ENABLE_CONSOLE
const int el_fd = EventLoop<Client>::Open();
if (el_fd < 0) {
ROCKS_LOG_ERROR(log, "Failed creating the event loop. Error message: '%s'",
......@@ -273,5 +274,9 @@ int ServerMain(ServerRunner *runner, rocksdb::DBImpl *db,
ExecuteTasks(executor.get(), curr_time, &el);
ServerCron(&last_cron_time, curr_time, &el, log);
}
#else
runner->closed_ = true;
return 0;
#endif
}
} // namespace cheapis
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册