refact: move container event handler to events

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

src/daemon/modules/container/container_unix.c

@@ -112,7 +112,7 @@ container_t *container_new(const char *runtime, const char *rootpath, const char
         goto error_out;
     }
 
-    cont->handler = events_handler_new();
+    cont->handler = container_events_handler_new();
     if (cont->handler == NULL) {
         ERROR("Out of memory");
         goto error_out;
@@ -163,7 +163,7 @@ void container_free(container_t *container)
 
     restart_manager_unref(container->rm);
 
-    events_handler_free(container->handler);
+    container_events_handler_free(container->handler);
 
     health_check_manager_free(container->health_check);
 

src/daemon/modules/container/container_unix.h

@@ -47,7 +47,7 @@ typedef struct _container_t_ {
     container_state_t *state;
     host_config *hostconfig;
     restart_manager_t *rm;
-    events_handler_t *handler;
+    container_events_handler_t *handler;
     health_check_manager_t *health_check;
 
     /* log configs of container */

src/daemon/modules/events/collector.c

@@ -828,7 +828,7 @@ static int post_event_to_events_hander(const struct isulad_events_format *events
         return 0;
     }
 
-    if (events_handler_post_events(events)) {
+    if (container_events_handler_post_events(events)) {
         ERROR("Failed to post events to events handler:%s", events->id);
         ret = -1;
         goto out;

src/daemon/modules/container/container_events_handler.c → src/daemon/modules/events/container_events_handler.c

 /******************************************************************************
- * Copyright (c) Huawei Technologies Co., Ltd. 2017-2019. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
  * iSulad licensed under the Mulan PSL v2.
  * You can use this software according to the terms and conditions of the Mulan PSL v2.
  * You may obtain a copy of Mulan PSL v2 at:
@@ -8,9 +8,9 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Author: tanyifeng
- * Create: 2017-11-22
- * Description: provide container events handler functions
+ * Author: lifeng
+ * Create: 2020-06-22
+ * Description: provide container events handler definition
  ******************************************************************************/
 #include <stdlib.h>
 #include <string.h>
@@ -31,7 +31,7 @@
 #include "plugin.h"
 
 /* events handler lock */
-static void events_handler_lock(events_handler_t *handler)
+static void events_handler_lock(container_events_handler_t *handler)
 {
     if (pthread_mutex_lock(&(handler->mutex)) != 0) {
         ERROR("Failed to lock events handler");
@@ -39,7 +39,7 @@ static void events_handler_lock(events_handler_t *handler)
 }
 
 /* events handler unlock */
-static void events_handler_unlock(events_handler_t *handler)
+static void events_handler_unlock(container_events_handler_t *handler)
 {
     if (pthread_mutex_unlock(&(handler->mutex)) != 0) {
         ERROR("Failed to unlock events handler");
@@ -47,7 +47,7 @@ static void events_handler_unlock(events_handler_t *handler)
 }
 
 /* events handler free */
-void events_handler_free(events_handler_t *handler)
+void container_events_handler_free(container_events_handler_t *handler)
 {
     struct isulad_events_format *event = NULL;
     struct linked_list *it = NULL;
@@ -71,12 +71,12 @@ void events_handler_free(events_handler_t *handler)
 }
 
 /* events handler new */
-events_handler_t *events_handler_new()
+container_events_handler_t *container_events_handler_new()
 {
     int ret;
-    events_handler_t *handler = NULL;
+    container_events_handler_t *handler = NULL;
 
-    handler = util_common_calloc_s(sizeof(events_handler_t));
+    handler = util_common_calloc_s(sizeof(container_events_handler_t));
     if (handler == NULL) {
         ERROR("Out of memory");
         return NULL;
@@ -95,7 +95,7 @@ events_handler_t *events_handler_new()
 
     return handler;
 cleanup:
-    events_handler_free(handler);
+    container_events_handler_free(handler);
     return NULL;
 }
 
@@ -191,7 +191,7 @@ out:
     return ret;
 }
 
-static int handle_one(container_t *cont, events_handler_t *handler)
+static int handle_one(container_t *cont, container_events_handler_t *handler)
 {
     struct linked_list *it = NULL;
     struct isulad_events_format *events = NULL;
@@ -231,7 +231,7 @@ static void *events_handler_thread(void *args)
     int ret = 0;
     char *name = args;
     container_t *cont = NULL;
-    events_handler_t *handler = NULL;
+    container_events_handler_t *handler = NULL;
 
     ret = pthread_detach(pthread_self());
     if (ret != 0) {
@@ -264,7 +264,7 @@ out:
 }
 
 /* events handler post events */
-int events_handler_post_events(const struct isulad_events_format *event)
+int container_events_handler_post_events(const struct isulad_events_format *event)
 {
     int ret = 0;
     char *name = NULL;

src/daemon/modules/container/container_events_handler.h → src/daemon/modules/events/container_events_handler.h

 /******************************************************************************
- * Copyright (c) Huawei Technologies Co., Ltd. 2017-2019. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
  * iSulad licensed under the Mulan PSL v2.
  * You can use this software according to the terms and conditions of the Mulan PSL v2.
  * You may obtain a copy of Mulan PSL v2 at:
@@ -8,12 +8,12 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
  * PURPOSE.
  * See the Mulan PSL v2 for more details.
- * Author: tanyifeng
- * Create: 2017-11-22
+ * Author: lifeng
+ * Create: 2020-06-22
  * Description: provide container events handler definition
  ******************************************************************************/
-#ifndef __EVENTS_HANDLER_H
-#define __EVENTS_HANDLER_H
+#ifndef __CONTAINER_EVENTS_HANDLER_H
+#define __CONTAINER_EVENTS_HANDLER_H
 
 #include <stdint.h>
 #include <pthread.h>
@@ -21,17 +21,17 @@
 
 #include "libisulad.h"
 
-typedef struct _events_handler_t {
+typedef struct _container_events_handler_t {
     pthread_mutex_t mutex;
     bool init_mutex;
     struct linked_list events_list;
     bool has_handler;
-} events_handler_t;
+} container_events_handler_t;
 
-events_handler_t *events_handler_new();
+container_events_handler_t *container_events_handler_new();
 
-void events_handler_free(events_handler_t *handler);
+void container_events_handler_free(container_events_handler_t *handler);
 
-int events_handler_post_events(const struct isulad_events_format *event);
+int container_events_handler_post_events(const struct isulad_events_format *event);
 
-#endif /* __EVENTS_HANDLER_H */
+#endif /* __CONTAINER_EVENTS_HANDLER_H */