Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
05ad95d1
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
大约 1 年 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05ad95d1
编写于
8月 27, 2021
作者:
S
sun_fan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
init: fix codex
Signed-off-by:
N
sun_fan
<
sun_fan1@hoperun.com
>
上级
5a0e3e14
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
55 addition
and
34 deletion
+55
-34
interfaces/innerkits/reboot/init_reboot.c
interfaces/innerkits/reboot/init_reboot.c
+1
-1
interfaces/innerkits/socket/init_socket.c
interfaces/innerkits/socket/init_socket.c
+3
-3
services/param/client/param_request.c
services/param/client/param_request.c
+2
-0
services/param/cmd/param_get.c
services/param/cmd/param_get.c
+4
-0
services/param/include/trigger_manager.h
services/param/include/trigger_manager.h
+2
-2
services/param/manager/param_manager.c
services/param/manager/param_manager.c
+9
-4
services/param/manager/param_trie.c
services/param/manager/param_trie.c
+2
-1
services/param/service/param_persist.c
services/param/service/param_persist.c
+4
-2
services/param/service/param_service.c
services/param/service/param_service.c
+9
-5
services/param/trigger/trigger_checker.c
services/param/trigger/trigger_checker.c
+6
-6
services/param/trigger/trigger_manager.c
services/param/trigger/trigger_manager.c
+5
-5
services/param/trigger/trigger_processor.c
services/param/trigger/trigger_processor.c
+5
-2
services/src/init_import.c
services/src/init_import.c
+1
-1
services/src/init_signal_handler.c
services/src/init_signal_handler.c
+2
-2
未找到文件。
interfaces/innerkits/reboot/init_reboot.c
浏览文件 @
05ad95d1
...
...
@@ -36,7 +36,7 @@ int DoReboot(const char *cmdContent)
}
char
value
[
MAX_REBOOT_VAUE_SIZE
];
if
(
cmdContent
==
NULL
||
strlen
(
cmdContent
)
==
0
)
{
if
(
snprintf_s
(
value
,
MAX_REBOOT_NAME_SIZE
,
MAX_REBOOT_NAME_SIZE
-
1
,
"%s"
,
"reboot"
)
<
0
)
{
if
(
snprintf_s
(
value
,
MAX_REBOOT_NAME_SIZE
,
strlen
(
"reboot"
)
+
1
,
"%s"
,
"reboot"
)
<
0
)
{
INIT_LOGE
(
"DoReboot api error, MAX_REBOOT_NAME_SIZE is not enough"
);
return
-
1
;
}
...
...
interfaces/innerkits/socket/init_socket.c
浏览文件 @
05ad95d1
...
...
@@ -34,9 +34,9 @@
#define MAX_SOCKET_ENV_PREFIX_LEN 64
#define MAX_SOCKET_DIR_LEN 128
static
int
GetControlFromEnv
(
char
*
path
)
static
int
GetControlFromEnv
(
char
*
path
,
int
length
)
{
if
(
path
==
NULL
)
{
if
(
path
==
NULL
||
length
<=
0
)
{
return
-
1
;
}
INIT_LOGI
(
"GetControlFromEnv path is %s "
,
path
);
...
...
@@ -68,7 +68,7 @@ int GetControlSocket(const char *name)
return
-
1
;
}
INIT_LOGI
(
"GetControlSocket path is %s "
,
path
);
int
fd
=
GetControlFromEnv
(
path
);
int
fd
=
GetControlFromEnv
(
path
,
MAX_SOCKET_ENV_PREFIX_LEN
);
if
(
fd
<
0
)
{
INIT_LOGE
(
"GetControlFromEnv fail "
);
return
-
1
;
...
...
services/param/client/param_request.c
浏览文件 @
05ad95d1
...
...
@@ -37,6 +37,7 @@ static void OnReceiveAlloc(uv_handle_t* handle, size_t suggestedSize, uv_buf_t*
{
// 这里需要按实际回复大小申请内存,不需要大内存
buf
->
base
=
(
char
*
)
malloc
(
sizeof
(
ResponseMsg
));
PARAM_CHECK
(
buf
->
base
!=
NULL
,
return
,
"OnReceiveAlloc malloc failed"
);
buf
->
len
=
sizeof
(
ResponseMsg
);
PARAM_LOGD
(
"OnReceiveAlloc handle %p %zu"
,
handle
,
suggestedSize
);
}
...
...
@@ -92,6 +93,7 @@ static int StartRequest(int cmd, RequestNode *request)
request
->
result
=
-
1
;
request
->
msg
.
type
=
cmd
;
request
->
loop
=
uv_loop_new
();
PARAM_CHECK
(
request
->
loop
!=
NULL
,
return
-
1
,
"StartRequest uv_loop_new failed"
);
uv_pipe_init
(
request
->
loop
,
&
request
->
handle
,
1
);
uv_pipe_connect
(
&
request
->
connect
,
&
request
->
handle
,
PIPE_NAME
,
OnConnection
);
uv_run
(
request
->
loop
,
UV_RUN_DEFAULT
);
...
...
services/param/cmd/param_get.c
浏览文件 @
05ad95d1
...
...
@@ -22,6 +22,10 @@
static
void
ProcessParam
(
ParamHandle
handle
,
void
*
cookie
)
{
if
(
cookie
==
NULL
)
{
printf
(
"ProcessParam cookie is NULL
\n
"
);
return
;
}
SystemGetParameterName
(
handle
,
(
char
*
)
cookie
,
BUFFER_SIZE
);
u_int32_t
size
=
BUFFER_SIZE
;
SystemGetParameterValue
(
handle
,
((
char
*
)
cookie
)
+
BUFFER_SIZE
,
&
size
);
...
...
services/param/include/trigger_manager.h
浏览文件 @
05ad95d1
...
...
@@ -103,7 +103,7 @@ typedef int (*CMD_EXECUTE) (TriggerNode *trigger, const char *cmdName, const cha
TriggerNode
*
GetTriggerByName
(
TriggerWorkSpace
*
workSpace
,
const
char
*
triggerName
,
u_int32_t
*
triggerIndex
);
int
ExecuteTrigger
(
TriggerWorkSpace
*
workSpace
,
TriggerNode
*
trigger
,
CMD_EXECUTE
cmdExecuter
);
int
CheckTrigger
(
TriggerWorkSpace
*
workSpace
,
int
CheckTrigger
(
const
TriggerWorkSpace
*
workSpace
,
int
type
,
void
*
content
,
u_int32_t
contentSize
,
PARAM_CHECK_DONE
triggerExecuter
);
int
CheckParamTrigger
(
TriggerWorkSpace
*
workSpace
,
const
char
*
content
,
u_int32_t
contentSize
,
PARAM_CHECK_DONE
triggerExecuter
);
...
...
@@ -123,4 +123,4 @@ TriggerWorkSpace *GetTriggerWorkSpace();
}
#endif
#endif
#endif // STARTUP_TRIGER_MANAGER_H
\ No newline at end of file
#endif // STARTUP_TRIGER_MANAGER_H
services/param/manager/param_manager.c
浏览文件 @
05ad95d1
...
...
@@ -66,10 +66,13 @@ int InitParamWorkSpace(ParamWorkSpace *workSpace, int onlyRead, const char *cont
workSpace
->
paramSpace
.
compareTrieNode
=
CompareTrieDataNode
;
workSpace
->
paramSpace
.
allocTrieNode
=
AllocateTrieDataNode
;
int
ret
=
InitWorkSpace
(
PARAM_STORAGE_PATH
,
&
workSpace
->
paramSpace
,
onlyRead
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"InitWorkSpace failed."
);
workSpace
->
paramLabelSpace
.
compareTrieNode
=
CompareTrieNode
;
// 必须先设置
workSpace
->
paramLabelSpace
.
allocTrieNode
=
AllocateTrieNode
;
ret
|=
InitWorkSpace
(
PARAM_INFO_PATH
,
&
workSpace
->
paramLabelSpace
,
onlyRead
);
ret
=
InitWorkSpace
(
PARAM_INFO_PATH
,
&
workSpace
->
paramLabelSpace
,
onlyRead
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"InitWorkSpace failed."
);
atomic_store_explicit
(
&
workSpace
->
flags
,
WORKSPACE_FLAGS_INIT
,
memory_order_release
);
return
ret
;
}
...
...
@@ -310,7 +313,7 @@ int CheckControlParamPerms(ParamWorkSpace *workSpace,
// their value is the name of the service to apply that action to. Permissions for these
// actions are based on the service, so we must create a fake name of ctl.<service> to
// check permissions.
int
n
=
snprintf_s
(
legacyName
,
size
,
s
ize
,
"ctl.%s"
,
value
);
int
n
=
snprintf_s
(
legacyName
,
size
,
s
trlen
(
"ctl."
)
+
strlen
(
value
)
+
1
,
"ctl.%s"
,
value
);
PARAM_CHECK
(
n
>
0
,
free
(
legacyName
);
return
PARAM_CODE_INVALID_PARAM
,
"Failed to snprintf value"
);
legacyName
[
n
]
=
'\0'
;
...
...
@@ -494,10 +497,12 @@ int BuildParamContent(char *content, u_int32_t contentSize, const char *name, co
int
offset
=
0
;
int
ret
=
memcpy_s
(
content
+
offset
,
contentSize
-
offset
,
name
,
nameLen
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to copy porperty"
);
offset
+=
nameLen
;
ret
|=
memcpy_s
(
content
+
offset
,
contentSize
-
offset
,
"="
,
1
);
ret
=
memcpy_s
(
content
+
offset
,
contentSize
-
offset
,
"="
,
1
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to copy porperty"
);
offset
+=
1
;
ret
|
=
memcpy_s
(
content
+
offset
,
contentSize
-
offset
,
value
,
valueLen
);
ret
=
memcpy_s
(
content
+
offset
,
contentSize
-
offset
,
value
,
valueLen
);
offset
+=
valueLen
;
content
[
offset
]
=
'\0'
;
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to copy porperty"
);
...
...
services/param/manager/param_trie.c
浏览文件 @
05ad95d1
...
...
@@ -471,7 +471,8 @@ u_int32_t AddData(WorkSpace *workSpace, const char *key, u_int32_t keyLen, const
atomic_init
(
&
node
->
serial
,
ATOMIC_VAR_INIT
(
0
));
atomic_init
(
&
node
->
dataLength
,
ATOMIC_VAR_INIT
(
dataLength
));
int
ret
=
memcpy_s
(
node
->
data
,
keyLen
,
key
,
keyLen
);
ret
|=
memcpy_s
(
node
->
data
+
keyLen
+
1
,
valueLen
,
value
,
valueLen
);
PARAM_CHECK
(
ret
==
0
,
return
0
,
"Failed to copy key"
);
ret
=
memcpy_s
(
node
->
data
+
keyLen
+
1
,
valueLen
,
value
,
valueLen
);
PARAM_CHECK
(
ret
==
0
,
return
0
,
"Failed to copy key"
);
node
->
data
[
keyLen
]
=
'='
;
node
->
data
[
keyLen
+
1
+
valueLen
]
=
'\0'
;
...
...
services/param/service/param_persist.c
浏览文件 @
05ad95d1
...
...
@@ -53,10 +53,11 @@ static int ProcessParamTraversal(WorkSpace *workSpace, TrieNode *node, void *coo
}
PersistContext
*
persistContext
=
(
PersistContext
*
)
cookie
;
int
ret
=
GetDataName
(
entry
,
persistContext
->
buffer
,
MAX_BUFF
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"GetDataName failed"
);
if
(
strncmp
(
persistContext
->
buffer
,
"persist."
,
strlen
(
"persist."
))
!=
0
)
{
return
0
;
}
ret
|
=
GetDataValue
(
entry
,
persistContext
->
buffer
+
MAX_BUFF
,
MAX_BUFF
);
ret
=
GetDataValue
(
entry
,
persistContext
->
buffer
+
MAX_BUFF
,
MAX_BUFF
);
if
(
ret
==
0
)
{
// 只支持新建
//PARAM_LOGI("Insert new persist param from normal param %s %s",
// persistContext->buffer, persistContext->buffer + MAX_BUFF);
...
...
@@ -78,7 +79,8 @@ static int ProcessPersistPropertTraversal(WorkSpace *workSpace, TrieNode *node,
}
PersistContext
*
persistContext
=
(
PersistContext
*
)
cookie
;
int
ret
=
GetDataName
(
entry
,
persistContext
->
buffer
,
MAX_BUFF
);
ret
|=
GetDataValue
(
entry
,
persistContext
->
buffer
+
MAX_BUFF
,
MAX_BUFF
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"GetDataName failed"
);
ret
=
GetDataValue
(
entry
,
persistContext
->
buffer
+
MAX_BUFF
,
MAX_BUFF
);
if
(
ret
==
0
)
{
//PARAM_LOGI("update normal param %s %s from persist param %u",
// persistContext->buffer, persistContext->buffer + MAX_BUFF, current->dataIndex);
...
...
services/param/service/param_service.c
浏览文件 @
05ad95d1
...
...
@@ -45,11 +45,12 @@ int LoadDefaultParams(const char *fileName)
if
((
flags
&
WORKSPACE_FLAGS_INIT
)
!=
WORKSPACE_FLAGS_INIT
)
{
return
PARAM_CODE_NOT_INIT
;
}
FILE
*
fp
=
fopen
(
fileName
,
"r"
);
PARAM_CHECK
(
fp
!=
NULL
,
return
-
1
,
"Open file %s fail"
,
fileName
);
char
buff
[
BUFFER_SIZE
];
SubStringInfo
*
info
=
malloc
(
sizeof
(
SubStringInfo
)
*
(
SUBSTR_INFO_LABEL
+
1
));
PARAM_CHECK
(
info
!=
NULL
,
return
-
1
,
"malloc failed"
);
while
(
fgets
(
buff
,
BUFFER_SIZE
,
fp
)
!=
NULL
)
{
int
subStrNumber
=
GetSubStringInfo
(
buff
,
strlen
(
buff
),
'='
,
info
,
SUBSTR_INFO_LABEL
+
1
);
if
(
subStrNumber
<=
SUBSTR_INFO_LABEL
)
{
...
...
@@ -85,6 +86,7 @@ int LoadParamInfos(const char *fileName)
FILE
*
fp
=
fopen
(
fileName
,
"r"
);
PARAM_CHECK
(
fp
!=
NULL
,
return
-
1
,
"Open file %s fail"
,
fileName
);
SubStringInfo
*
info
=
malloc
(
sizeof
(
SubStringInfo
)
*
SUBSTR_INFO_MAX
);
PARAM_CHECK
(
info
!=
NULL
,
return
-
1
,
"Load parameter malloc failed."
);
char
buff
[
BUFFER_SIZE
];
int
infoCount
=
0
;
while
(
fgets
(
buff
,
BUFFER_SIZE
,
fp
)
!=
NULL
)
{
...
...
@@ -140,7 +142,7 @@ static void OnWriteResponse(uv_write_t *req, int status)
free
(
node
);
}
static
void
SendResponse
(
uv_stream_t
*
handle
,
RequestType
type
,
int
result
,
void
*
content
,
int
size
)
static
void
SendResponse
(
uv_stream_t
*
handle
,
RequestType
type
,
int
result
,
const
void
*
content
,
int
size
)
{
int
ret
=
0
;
// 申请整块内存,用于回复数据和写请求
...
...
@@ -158,11 +160,13 @@ static void SendResponse(uv_stream_t *handle, RequestType type, int result, void
PARAM_CHECK
(
ret
>=
0
,
return
,
"Failed to uv_write2 ret %s"
,
uv_strerror
(
ret
));
}
static
void
OnReceiveRequest
(
uv_stream_t
*
handle
,
ssize_t
nread
,
const
uv_buf_t
*
buf
)
static
void
OnReceiveRequest
(
uv_stream_t
*
handle
,
ssize_t
nread
,
uv_buf_t
*
buf
)
{
if
(
nread
<=
0
||
buf
==
NULL
||
buf
->
base
==
NULL
)
{
uv_close
((
uv_handle_t
*
)
handle
,
OnClose
);
free
(
buf
->
base
);
if
(
buf
!=
NULL
&&
buf
->
base
!=
NULL
)
{
free
(
buf
->
base
);
}
return
;
}
int
freeHandle
=
1
;
...
...
@@ -179,6 +183,7 @@ static void OnReceiveRequest(uv_stream_t *handle, ssize_t nread, const uv_buf_t
break
;
}
free
(
buf
->
base
);
buf
->
base
=
NULL
;
uv_close
((
uv_handle_t
*
)
handle
,
OnClose
);
}
...
...
@@ -227,7 +232,6 @@ int StartParamService()
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"Failed to chmod %s, err %d. "
,
PIPE_NAME
,
errno
);
ret
=
uv_listen
((
uv_stream_t
*
)
&
pipeServer
,
SOMAXCONN
,
OnConnection
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"Failed to uv_listen %d %s"
,
ret
,
uv_err_name
(
ret
));
uv_run
(
uv_default_loop
(),
UV_RUN_DEFAULT
);
PARAM_LOGI
(
"Start service exit."
);
return
0
;
...
...
services/param/trigger/trigger_checker.c
浏览文件 @
05ad95d1
...
...
@@ -80,7 +80,7 @@ static int CalculatorPopChar(LogicCalculator *calculator, char *data)
return
0
;
}
static
int
CalculatorPush
(
LogicCalculator
*
calculator
,
void
*
data
)
static
int
CalculatorPush
(
LogicCalculator
*
calculator
,
const
void
*
data
)
{
PARAM_CHECK
(
calculator
!=
NULL
,
return
-
1
,
"Invalid param"
);
PARAM_CHECK
(
calculator
->
endIndex
<
calculator
->
dataNumber
,
return
-
1
,
"More data for calculator support"
);
...
...
@@ -93,7 +93,7 @@ static int CalculatorPush(LogicCalculator *calculator, void *data)
static
int
CalculatorPop
(
LogicCalculator
*
calculator
,
void
*
data
)
{
PARAM_CHECK
(
calculator
!=
NULL
||
data
=
=
NULL
,
return
-
1
,
"Invalid param"
);
PARAM_CHECK
(
calculator
!=
NULL
&&
data
!
=
NULL
,
return
-
1
,
"Invalid param"
);
PARAM_CHECK
(
calculator
->
endIndex
<
calculator
->
dataNumber
,
return
-
1
,
"More data for calculator support"
);
if
(
calculator
->
endIndex
==
0
)
{
return
-
1
;
...
...
@@ -212,8 +212,8 @@ int ComputeCondition(LogicCalculator *calculator, const char *condition)
if
(
condition
[
currIndex
]
==
'|'
||
condition
[
currIndex
]
==
'&'
)
{
noneOper
=
0
;
int
ret
=
CalculatorPop
(
calculator
,
(
void
*
)
&
data2
);
ret
|
=
CalculatorPop
(
calculator
,
(
void
*
)
&
data1
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to pop data"
);
int
ret1
=
CalculatorPop
(
calculator
,
(
void
*
)
&
data1
);
PARAM_CHECK
(
(
ret
==
0
&&
ret1
==
0
)
,
return
-
1
,
"Failed to pop data"
);
ret
=
ComputeSubCondition
(
calculator
,
&
data1
,
condition
);
data1
.
flags
=
0
;
...
...
@@ -254,7 +254,7 @@ int ComputeCondition(LogicCalculator *calculator, const char *condition)
int
ConvertInfixToPrefix
(
const
char
*
condition
,
char
*
prefix
,
u_int32_t
prefixLen
)
{
char
e
;
char
e
=
0
;
int
ret
=
0
;
u_int32_t
curr
=
0
;
u_int32_t
prefixIndex
=
0
;
...
...
@@ -309,4 +309,4 @@ char *GetMatchedSubCondition(const char *condition, const char *input, int lengt
}
}
return
NULL
;
}
\ No newline at end of file
}
services/param/trigger/trigger_manager.c
浏览文件 @
05ad95d1
...
...
@@ -238,7 +238,7 @@ int ParseTrigger(TriggerWorkSpace *workSpace, cJSON *triggerItem)
for
(
int
i
=
0
;
i
<
cmdLinesCnt
;
++
i
)
{
char
*
cmdLineStr
=
cJSON_GetStringValue
(
cJSON_GetArrayItem
(
cmdItems
,
i
));
PARAM_CHECK
(
cmdLine
sCnt
>
0
,
continue
,
"Command is null"
);
PARAM_CHECK
(
cmdLine
Str
!=
NULL
,
continue
,
"Command is null"
);
size_t
cmdLineLen
=
strlen
(
cmdLineStr
);
const
char
*
matchCmd
=
GetMatchCmd
(
cmdLineStr
);
...
...
@@ -351,13 +351,13 @@ static int CheckTrigger_(TriggerWorkSpace *workSpace,
return
0
;
}
int
CheckTrigger
(
TriggerWorkSpace
*
workSpace
,
int
CheckTrigger
(
const
TriggerWorkSpace
*
workSpace
,
int
type
,
void
*
content
,
u_int32_t
contentSize
,
PARAM_CHECK_DONE
triggerExecuter
)
{
PARAM_CHECK
(
workSpace
!=
NULL
&&
content
!=
NULL
&&
triggerExecuter
!=
NULL
,
return
-
1
,
"Failed arg for trigger"
);
LogicCalculator
calculator
;
LogicCalculator
calculator
=
{}
;
calculator
.
triggerExecuter
=
triggerExecuter
;
return
CheckTrigger_
(
workSpace
,
&
calculator
,
type
,
(
char
*
)
content
,
contentSize
);
}
...
...
@@ -367,7 +367,7 @@ int CheckParamTrigger(TriggerWorkSpace *workSpace,
{
PARAM_CHECK
(
workSpace
!=
NULL
&&
content
!=
NULL
&&
triggerExecuter
!=
NULL
,
return
-
1
,
"Failed arg for param trigger"
);
LogicCalculator
calculator
;
LogicCalculator
calculator
=
{}
;
CalculatorInit
(
&
calculator
,
100
,
sizeof
(
LogicData
),
1
);
// 先解析content
...
...
@@ -387,7 +387,7 @@ int CheckAndExecuteTrigger(TriggerWorkSpace *workSpace, const char *content, PAR
{
PARAM_CHECK
(
workSpace
!=
NULL
&&
content
!=
NULL
&&
triggerExecuter
!=
NULL
,
return
-
1
,
"Failed arg for param trigger"
);
LogicCalculator
calculator
;
LogicCalculator
calculator
=
{}
;
CalculatorInit
(
&
calculator
,
100
,
sizeof
(
LogicData
),
1
);
int
ret
=
memcpy_s
(
calculator
.
triggerContent
,
sizeof
(
calculator
.
triggerContent
),
content
,
strlen
(
content
));
...
...
services/param/trigger/trigger_processor.c
浏览文件 @
05ad95d1
...
...
@@ -123,6 +123,9 @@ static const char *GetCmdInfo(const char *content, u_int32_t contentSize, char *
static
void
SendTriggerEvent
(
TriggerDataEvent
*
event
)
{
if
(
event
==
NULL
)
{
return
;
}
int
ctrlSize
=
strlen
(
SYS_POWER_CTRL
);
if
(
strncmp
(
event
->
content
,
SYS_POWER_CTRL
,
ctrlSize
)
==
0
)
{
char
*
cmdParam
=
NULL
;
...
...
@@ -169,7 +172,7 @@ void PostTrigger(EventType type, const char *content, u_int32_t contentLen)
event
->
type
=
type
;
event
->
request
.
data
=
(
char
*
)
event
+
sizeof
(
uv_work_t
);
event
->
contentSize
=
contentLen
;
memcpy_s
(
event
->
content
,
contentLen
,
content
,
contentLen
);
PARAM_CHECK
(
memcpy_s
(
event
->
content
,
contentLen
,
content
,
contentLen
)
==
0
,
return
,
"Failed to copy content"
);
event
->
content
[
contentLen
]
=
'\0'
;
SendTriggerEvent
(
event
);
PARAM_LOGD
(
"PostTrigger %d success"
,
type
);
...
...
@@ -209,4 +212,4 @@ void DoTriggerExec(const char *content)
TriggerWorkSpace
*
GetTriggerWorkSpace
()
{
return
&
g_triggerWorkSpace
;
}
\ No newline at end of file
}
services/src/init_import.c
浏览文件 @
05ad95d1
...
...
@@ -23,7 +23,7 @@
#include "securec.h"
#ifndef OHOS_LITE
static
int
ExtractCfgFile
(
char
**
cfgFile
,
char
*
content
)
static
int
ExtractCfgFile
(
char
**
cfgFile
,
c
onst
c
har
*
content
)
{
if
((
!
cfgFile
)
||
(
!
content
))
{
return
-
1
;
...
...
services/src/init_signal_handler.c
浏览文件 @
05ad95d1
...
...
@@ -118,8 +118,8 @@ static void UVSignalHandler(uv_signal_t* handle, int signum)
void
SignalInitModule
()
{
int
ret
=
uv_signal_init
(
uv_default_loop
(),
&
g_sigchldHandler
);
ret
|
=
uv_signal_init
(
uv_default_loop
(),
&
g_sigtermHandler
);
if
(
ret
!=
0
)
{
int
ret1
=
uv_signal_init
(
uv_default_loop
(),
&
g_sigtermHandler
);
if
(
ret
!=
0
&&
ret1
!=
0
)
{
INIT_LOGW
(
"initialize signal handler failed"
);
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录