!320 modify: normalized L1 & L2 ueventd ondemand

Merge pull request !320 from 熊磊/init0216plus

ueventd/BUILD.gn

@@ -17,11 +17,11 @@ if (defined(ohos_lite)) {
       sources = [
         "//base/startup/init_lite/services/utils/init_utils.c",
         "//base/startup/init_lite/services/utils/list.c",
-        "//base/startup/init_lite/ueventd/lite/ueventd_main.c",
         "//base/startup/init_lite/ueventd/lite/ueventd_parameter.c",
         "//base/startup/init_lite/ueventd/ueventd.c",
         "//base/startup/init_lite/ueventd/ueventd_device_handler.c",
         "//base/startup/init_lite/ueventd/ueventd_firmware_handler.c",
+        "//base/startup/init_lite/ueventd/ueventd_main.c",
         "//base/startup/init_lite/ueventd/ueventd_read_cfg.c",
         "//base/startup/init_lite/ueventd/ueventd_socket.c",
       ]
@@ -104,8 +104,8 @@ if (defined(ohos_lite)) {
   ohos_executable("ueventd") {
     sources = service_ueventd_sources
     sources += [
-      "//base/startup/init_lite/ueventd/standard/ueventd_main.c",
       "//base/startup/init_lite/ueventd/standard/ueventd_parameter.c",
+      "//base/startup/init_lite/ueventd/ueventd_main.c",
     ]
     include_dirs = service_ueventd_include
     include_dirs += [

ueventd/lite/ueventd_main.c

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <poll.h>
-#include "ueventd.h"
-#include "ueventd_read_cfg.h"
-#include "ueventd_socket.h"
-#define INIT_LOG_TAG "ueventd"
-#include "init_log.h"
-
-int main(int argc, char **argv)
-{
-    char *ueventdConfigs[] = {"/etc/ueventd.config", NULL};
-    int i = 0;
-    int ret = -1;
-    while (ueventdConfigs[i] != NULL) {
-        ParseUeventdConfigFile(ueventdConfigs[i++]);
-    }
-    int ueventSockFd = UeventdSocketInit();
-    if (ueventSockFd < 0) {
-        INIT_LOGE("Failed to create uevent socket");
-        return -1;
-    }
-
-    RetriggerUevent(ueventSockFd, NULL, 0); // Not require boot devices
-    struct pollfd pfd = {};
-    pfd.events = POLLIN;
-    pfd.fd = ueventSockFd;
-
-    while (1) {
-        pfd.revents = 0;
-        ret = poll(&pfd, 1, -1);
-        if (ret <= 0) {
-            continue;
-        }
-        if (pfd.revents & POLLIN) {
-            ProcessUevent(ueventSockFd, NULL, 0); // Not require boot devices
-        }
-    }
-    return 0;
-}