提交 b1011d5c 编写于 作者: X xionglei6

modify: bind cpu core

Signed-off-by: Nxionglei6 <xionglei6@huawei.com>
上级 93bec381
......@@ -175,6 +175,7 @@ Service *AddService(const char *name)
node->data.service = service;
service->name = node->name;
service->status = SERVICE_IDLE;
CPU_ZERO(&service->cpuSet);
g_serviceSpace.serviceCount++;
INIT_LOGV("AddService %s", node->name);
return service;
......@@ -644,10 +645,7 @@ static int CheckServiceKeyName(const cJSON *curService)
char *cfgServiceKeyList[] = {
"name", "path", "uid", "gid", "once", "importance", "caps", "disabled",
"writepid", "critical", "socket", "console", "dynamic", "file", "ondemand",
"d-caps", "apl", "jobs", "start-mode", "end-mode", "cpucore",
#ifdef WITH_SELINUX
SECON_STR_IN_CFG,
#endif // WITH_SELINUX
"d-caps", "apl", "jobs", "start-mode", "end-mode", "cpucore", "secon"
};
INIT_CHECK_RETURN_VALUE(curService != NULL, SERVICE_FAILURE);
cJSON *child = curService->child;
......
......@@ -17,11 +17,6 @@
static const pid_t INIT_PROCESS_PID = 1;
int __attribute__((weak)) AtlibInit(void)
{
return 0;
}
int main(int argc, char * const argv[])
{
int isSecondStage = 0;
......@@ -40,7 +35,6 @@ int main(int argc, char * const argv[])
LogInit();
}
LogInit();
(void)AtlibInit();
SystemInit();
SystemExecuteRcs();
SystemConfig();
......
......@@ -62,6 +62,7 @@ static int FdHolderSockInit(void)
unlink(INIT_HOLDER_SOCKET_PATH);
}
struct sockaddr_un addr;
addr.sun_family = AF_UNIX;
if (strncpy_s(addr.sun_path, sizeof(addr.sun_path),
INIT_HOLDER_SOCKET_PATH, strlen(INIT_HOLDER_SOCKET_PATH)) != 0) {
INIT_LOGE("Faild to copy fd hoder socket path");
......@@ -70,7 +71,7 @@ static int FdHolderSockInit(void)
}
socklen_t len = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path) + 1);
if (bind(sock, (struct sockaddr *)&addr, len) < 0) {
INIT_LOGE("Failed to binder fd folder socket");
INIT_LOGE("Failed to binder fd folder socket %d", errno);
close(sock);
return -1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册