Merge pull request #2561 from fengzeroz/v2.12

version: 2.12.2

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
       - published
 
 env:
-  VERSION: 2.12.0
+  VERSION: 2.12.2
   UI_VERSION: 2.6.1
   BRANCH: v2.12
 

include/neuron/define.h

@@ -24,7 +24,7 @@
 
 #define NEU_VERSION_MAJOR 2
 #define NEU_VERSION_MINOR 12
-#define NEU_VERSION_FIX 0
+#define NEU_VERSION_FIX 2
 
 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16)
 #define NEU_GET_VERSION_MINOR(V) ((0x0000ff00 & V) >> 8)

include/neuron/event/event.h

@@ -35,7 +35,7 @@ typedef struct neu_events neu_events_t;
  * thread.
  * @return the newly created event.
  */
-neu_events_t *neu_event_new(void);
+neu_events_t *neu_event_new(const char *name);
 
 /**
  * @brief Close a event.

include/neuron/msg.h

@@ -61,6 +61,8 @@ typedef enum neu_reqresp_type {
     NEU_REQ_SUBSCRIBE_GROUPS,
     NEU_REQ_GET_SUBSCRIBE_GROUP,
     NEU_RESP_GET_SUBSCRIBE_GROUP,
+    NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP,
+    NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP,
     NEU_REQ_GET_SUB_DRIVER_TAGS,
     NEU_RESP_GET_SUB_DRIVER_TAGS,
 
@@ -188,14 +190,17 @@ static const char *neu_reqresp_type_string_t[] = {
     [NEU_RESP_WRITE_TAGS]          = "NEU_RESP_WRITE_TAGS",
     [NEU_REQ_WRITE_GTAGS]          = "NEU_REQ_WRITE_GTAGS",
 
-    [NEU_REQ_SUBSCRIBE_GROUP]        = "NEU_REQ_SUBSCRIBE_GROUP",
-    [NEU_REQ_UNSUBSCRIBE_GROUP]      = "NEU_REQ_UNSUBSCRIBE_GROUP",
-    [NEU_REQ_UPDATE_SUBSCRIBE_GROUP] = "NEU_REQ_UPDATE_SUBSCRIBE_GROUP",
-    [NEU_REQ_SUBSCRIBE_GROUPS]       = "NEU_REQ_SUBSCRIBE_GROUPS",
-    [NEU_REQ_GET_SUBSCRIBE_GROUP]    = "NEU_REQ_GET_SUBSCRIBE_GROUP",
-    [NEU_RESP_GET_SUBSCRIBE_GROUP]   = "NEU_RESP_GET_SUBSCRIBE_GROUP",
-    [NEU_REQ_GET_SUB_DRIVER_TAGS]    = "NEU_REQ_GET_SUB_DRIVER_TAGS",
-    [NEU_RESP_GET_SUB_DRIVER_TAGS]   = "NEU_RESP_GET_SUB_DRIVER_TAGS",
+    [NEU_REQ_SUBSCRIBE_GROUP]            = "NEU_REQ_SUBSCRIBE_GROUP",
+    [NEU_REQ_UNSUBSCRIBE_GROUP]          = "NEU_REQ_UNSUBSCRIBE_GROUP",
+    [NEU_REQ_UPDATE_SUBSCRIBE_GROUP]     = "NEU_REQ_UPDATE_SUBSCRIBE_GROUP",
+    [NEU_REQ_SUBSCRIBE_GROUPS]           = "NEU_REQ_SUBSCRIBE_GROUPS",
+    [NEU_REQ_GET_SUBSCRIBE_GROUP]        = "NEU_REQ_GET_SUBSCRIBE_GROUP",
+    [NEU_RESP_GET_SUBSCRIBE_GROUP]       = "NEU_RESP_GET_SUBSCRIBE_GROUP",
+    [NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP] = "NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP",
+    [NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP] =
+        "NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP",
+    [NEU_REQ_GET_SUB_DRIVER_TAGS]  = "NEU_REQ_GET_SUB_DRIVER_TAGS",
+    [NEU_RESP_GET_SUB_DRIVER_TAGS] = "NEU_RESP_GET_SUB_DRIVER_TAGS",
 
     [NEU_REQ_GET_DATALAYERS_GROUPS]  = "NEU_REQ_GET_DATALAYERS_GROUPS",
     [NEU_RESP_GET_DATALAYERS_GROUPS] = "NEU_RESP_GET_DATALAYERS_GROUPS",
@@ -699,6 +704,11 @@ typedef struct neu_req_get_subscribe_group {
     char group[NEU_GROUP_NAME_LEN];
 } neu_req_get_subscribe_group_t;
 
+typedef struct neu_req_get_driver_subscribe_group {
+    char app[NEU_NODE_NAME_LEN];
+    char name[NEU_NODE_NAME_LEN];
+} neu_req_get_driver_subscribe_group_t;
+
 typedef struct {
     char app[NEU_NODE_NAME_LEN];
     char driver[NEU_NODE_NAME_LEN];
@@ -714,6 +724,13 @@ typedef struct neu_resp_subscribe_info {
     char *static_tags;
 } neu_resp_subscribe_info_t;
 
+typedef struct neu_resp_driver_subscribe_info {
+    char driver[NEU_NODE_NAME_LEN];
+    char app[NEU_NODE_NAME_LEN];
+    char group[NEU_GROUP_NAME_LEN];
+    bool subscribed;
+} neu_resp_driver_subscribe_info_t;
+
 static inline void neu_resp_subscribe_info_fini(neu_resp_subscribe_info_t *info)
 {
     free(info->params);
@@ -737,7 +754,8 @@ typedef struct {
 } neu_resp_get_sub_driver_tags_t;
 
 typedef struct neu_resp_get_subscribe_group {
-    UT_array *groups; // array neu_resp_subscribe_info_t
+    UT_array *groups; // array neu_resp_subscribe_info_t or
+                      // neu_resp_driver_subscribe_info_t
 } neu_resp_get_subscribe_group_t;
 
 typedef struct neu_req_node_setting {
@@ -888,10 +906,11 @@ typedef struct neu_resp_tag_value {
 typedef neu_resp_tag_value_t neu_tag_value_t;
 
 typedef struct neu_resp_tag_value_meta {
-    char           tag[NEU_TAG_NAME_LEN];
-    neu_dvalue_t   value;
-    neu_tag_meta_t metas[NEU_TAG_META_SIZE];
-    neu_datatag_t  datatag;
+    char            tag[NEU_TAG_NAME_LEN];
+    neu_dvalue_t    value;
+    neu_tag_meta_t *metas;
+    int             n_meta;
+    neu_datatag_t   datatag;
 } neu_resp_tag_value_meta_t;
 
 static inline UT_icd *neu_resp_tag_value_meta_icd()
@@ -962,10 +981,11 @@ typedef struct {
 } neu_resp_read_group_t;
 
 typedef struct neu_resp_tag_value_meta_paginate {
-    char           tag[NEU_TAG_NAME_LEN];
-    neu_dvalue_t   value;
-    neu_tag_meta_t metas[NEU_TAG_META_SIZE];
-    neu_datatag_t  datatag;
+    char            tag[NEU_TAG_NAME_LEN];
+    neu_dvalue_t    value;
+    neu_tag_meta_t *metas;
+    int             n_meta;
+    neu_datatag_t   datatag;
 } neu_resp_tag_value_meta_paginate_t;
 
 static inline UT_icd *neu_resp_tag_value_meta_paginate_icd()
@@ -996,6 +1016,13 @@ static inline void neu_resp_read_free(neu_resp_read_group_t *resp)
                    tag_value->value.type < NEU_TYPE_ARRAY_STRING) {
             free(tag_value->value.value.bools.bools);
         }
+
+        if (tag_value->metas != NULL) {
+            for (int i = 0; i < tag_value->n_meta; i++) {
+                neu_free_dvalue(&tag_value->metas[i].value);
+            }
+            free(tag_value->metas);
+        }
     }
     free(resp->driver);
     free(resp->group);
@@ -1013,6 +1040,13 @@ neu_resp_read_paginate_free(neu_resp_read_group_paginate_t *resp)
                    tag_value->value.type < NEU_TYPE_ARRAY_STRING) {
             free(tag_value->value.value.bools.bools);
         }
+
+        if (tag_value->metas != NULL) {
+            for (int i = 0; i < tag_value->n_meta; i++) {
+                neu_free_dvalue(&tag_value->metas[i].value);
+            }
+            free(tag_value->metas);
+        }
     }
     free(resp->driver);
     free(resp->group);
@@ -1090,6 +1124,13 @@ static inline void neu_trans_data_free(neu_reqresp_trans_data_t *data)
                        tag_value->value.type < NEU_TYPE_ARRAY_STRING) {
                 free(tag_value->value.value.bools.bools);
             }
+
+            if (tag_value->metas != NULL) {
+                for (int i = 0; i < tag_value->n_meta; i++) {
+                    neu_free_dvalue(&tag_value->metas[i].value);
+                }
+                free(tag_value->metas);
+            }
         }
         utarray_free(data->tags);
         free(data->group);
@@ -1108,18 +1149,21 @@ static inline void neu_tag_value_to_json(neu_resp_tag_value_meta_t *tag_value,
     tag_json->name  = tag_value->tag;
     tag_json->error = 0;
 
-    for (int k = 0; k < NEU_TAG_META_SIZE; k++) {
-        if (strlen(tag_value->metas[k].name) > 0) {
-            tag_json->n_meta++;
-        } else {
-            break;
-        }
-    }
+    // for (int k = 0; k < NEU_TAG_META_SIZE; k++) {
+    //     if (strlen(tag_value->metas[k].name) > 0) {
+    //         tag_json->n_meta++;
+    //     } else {
+    //         break;
+    //     }
+    // }
+
+    tag_json->n_meta = tag_value->n_meta;
+
     if (tag_json->n_meta > 0) {
         tag_json->metas = (neu_json_tag_meta_t *) calloc(
             tag_json->n_meta, sizeof(neu_json_tag_meta_t));
     }
-    neu_json_metas_to_json(tag_value->metas, NEU_TAG_META_SIZE, tag_json);
+    neu_json_metas_to_json(tag_value->metas, tag_value->n_meta, tag_json);
 
     tag_json->datatag.bias = tag_value->datatag.bias;
 
@@ -1317,18 +1361,21 @@ neu_tag_value_to_json_paginate(neu_resp_tag_value_meta_paginate_t *tag_value,
     memcpy(tag_json->datatag.meta, tag_value->datatag.meta,
            NEU_TAG_META_LENGTH);
 
-    for (int k = 0; k < NEU_TAG_META_SIZE; k++) {
-        if (strlen(tag_value->metas[k].name) > 0) {
-            tag_json->n_meta++;
-        } else {
-            break;
-        }
-    }
+    // for (int k = 0; k < NEU_TAG_META_SIZE; k++) {
+    //     if (strlen(tag_value->metas[k].name) > 0) {
+    //         tag_json->n_meta++;
+    //     } else {
+    //         break;
+    //     }
+    // }
+
+    tag_json->n_meta = tag_value->n_meta;
+
     if (tag_json->n_meta > 0) {
         tag_json->metas = (neu_json_tag_meta_t *) calloc(
             tag_json->n_meta, sizeof(neu_json_tag_meta_t));
     }
-    neu_json_metas_to_json_paginate(tag_value->metas, NEU_TAG_META_SIZE,
+    neu_json_metas_to_json_paginate(tag_value->metas, tag_value->n_meta,
                                     tag_json);
 
     switch (tag_value->value.type) {

include/neuron/tag.h

@@ -43,6 +43,10 @@ typedef enum {
     NEU_DATATAG_ENDIAN_BL32 = 5, // #BL 2,1,4,3
     NEU_DATATAG_ENDIAN_L64  = 6, // #L  8,7,6,5,4,3,2,1
     NEU_DATATAG_ENDIAN_B64  = 7, // #B  1,2,3,4,5,6,7,8
+    NEU_DATATAG_ENDIAN_LL64 = 8,
+    NEU_DATATAG_ENDIAN_LB64 = 9,
+    NEU_DATATAG_ENDIAN_BB64 = 10,
+    NEU_DATATAG_ENDIAN_BL64 = 11,
 } neu_datatag_endian_e;
 
 typedef enum {
@@ -62,6 +66,7 @@ typedef union {
     } value32;
     struct {
         neu_datatag_endian_e endian;
+        bool                 is_default;
     } value64;
     struct {
         uint16_t                  length;

include/neuron/type.h

@@ -890,6 +890,42 @@ static inline uint64_t neu_htonll(uint64_t u)
     return ret;
 }
 
+static inline uint64_t neu_htonlb(uint64_t u)
+{
+    uint8_t *in        = (uint8_t *) &u;
+    uint64_t out       = 0;
+    uint8_t *out_bytes = (uint8_t *) &out;
+
+    out_bytes[0] = in[1];
+    out_bytes[1] = in[0];
+    out_bytes[2] = in[3];
+    out_bytes[3] = in[2];
+    out_bytes[4] = in[5];
+    out_bytes[5] = in[4];
+    out_bytes[6] = in[7];
+    out_bytes[7] = in[6];
+
+    return out;
+}
+
+static inline uint64_t neu_htonbl(uint64_t u)
+{
+    uint8_t *in        = (uint8_t *) &u;
+    uint64_t out       = 0;
+    uint8_t *out_bytes = (uint8_t *) &out;
+
+    out_bytes[0] = in[6];
+    out_bytes[1] = in[7];
+    out_bytes[2] = in[4];
+    out_bytes[3] = in[5];
+    out_bytes[4] = in[2];
+    out_bytes[5] = in[3];
+    out_bytes[6] = in[0];
+    out_bytes[7] = in[1];
+
+    return out;
+}
+
 static inline uint64_t neu_ntohll(uint64_t u)
 {
     return neu_htonll(u);

plugins/datalayers/datalayers_handle.c

@@ -185,21 +185,27 @@ void db_write_task_consumer(neu_plugin_t *plugin)
     db_write_task_t *task = NULL;
 
     while (1) {
-        pthread_rwlock_rdlock(&plugin->plugin_mutex);
-        if (plugin->consumer_thread_stop_flag) {
-            pthread_rwlock_unlock(&plugin->plugin_mutex);
+        pthread_mutex_lock(&plugin->queue_mutex);
+
+        while (plugin->task_queue.size == 0 &&
+               !plugin->consumer_thread_stop_flag) {
+            pthread_cond_wait(&plugin->queue_not_empty, &plugin->queue_mutex);
+        }
+
+        if (plugin->consumer_thread_stop_flag && plugin->task_queue.size == 0) {
+            pthread_mutex_unlock(&plugin->queue_mutex);
             break;
         }
-        pthread_rwlock_unlock(&plugin->plugin_mutex);
 
         task = task_queue_pop(plugin, &plugin->task_queue);
+        pthread_mutex_unlock(&plugin->queue_mutex);
+
         if (task) {
             db_write_task_cb(task, plugin);
             task_free(task);
-        } else {
-            usleep(1000);
         }
     }
+
     plog_notice(plugin, "Consumer thread exiting gracefully.\n");
 }
 
@@ -558,10 +564,13 @@ int handle_trans_data(neu_plugin_t *            plugin,
     task->bool_tags       = bool_tags;
     task->string_tags     = string_tags;
 
-    task_queue_push(plugin, task);
-
     pthread_rwlock_unlock(&plugin->plugin_mutex);
 
+    pthread_mutex_lock(&plugin->queue_mutex);
+    task_queue_push(plugin, task);
+    pthread_cond_signal(&plugin->queue_not_empty);
+    pthread_mutex_unlock(&plugin->queue_mutex);
+
     return rv;
 }
 

plugins/datalayers/datalayers_plugin.h

@@ -68,6 +68,9 @@ struct neu_plugin {
     task_queue_t task_queue;
     pthread_t    consumer_thread;
 
+    pthread_mutex_t queue_mutex;
+    pthread_cond_t  queue_not_empty;
+
     pthread_rwlock_t plugin_mutex;
     bool             consumer_thread_stop_flag;
 

plugins/datalayers/datalayers_plugin_intf.c

@@ -33,9 +33,9 @@ extern const neu_plugin_module_t neu_plugin_module;
 
 void create_consumer_thread(neu_plugin_t *plugin)
 {
-    pthread_rwlock_wrlock(&plugin->plugin_mutex);
+    pthread_mutex_lock(&plugin->queue_mutex);
     plugin->consumer_thread_stop_flag = false;
-    pthread_rwlock_unlock(&plugin->plugin_mutex);
+    pthread_mutex_unlock(&plugin->queue_mutex);
 
     int status = pthread_create(&plugin->consumer_thread, NULL,
                                 (void *) db_write_task_consumer, plugin);
@@ -54,9 +54,10 @@ neu_plugin_t *datalayers_plugin_open(void)
 
 void stop_consumer_thread(pthread_t *consumer_thread, neu_plugin_t *plugin)
 {
-    pthread_rwlock_wrlock(&plugin->plugin_mutex);
+    pthread_mutex_lock(&plugin->queue_mutex);
     plugin->consumer_thread_stop_flag = true;
-    pthread_rwlock_unlock(&plugin->plugin_mutex);
+    pthread_cond_broadcast(&plugin->queue_not_empty);
+    pthread_mutex_unlock(&plugin->queue_mutex);
 
     int join_status = pthread_join(*consumer_thread, NULL);
     if (join_status != 0) {
@@ -81,11 +82,17 @@ int datalayers_plugin_init(neu_plugin_t *plugin, bool load)
 
     pthread_rwlock_init(&plugin->plugin_mutex, NULL);
 
+    pthread_mutex_init(&plugin->queue_mutex, NULL);
+    pthread_cond_init(&plugin->queue_not_empty, NULL);
+
+    pthread_mutex_lock(&plugin->queue_mutex);
+    plugin->consumer_thread_stop_flag = false;
+    pthread_mutex_unlock(&plugin->queue_mutex);
+
     task_queue_init(&plugin->task_queue);
 
     pthread_create(&plugin->consumer_thread, NULL,
                    (void *) db_write_task_consumer, plugin);
-    pthread_detach(plugin->consumer_thread);
 
     NEU_PLUGIN_REGISTER_CACHED_QUEUE_SIZE_METRIC(plugin);
     NEU_PLUGIN_REGISTER_MAX_CACHED_QUEUE_SIZE_METRIC(plugin);
@@ -101,7 +108,11 @@ int datalayers_plugin_uninit(neu_plugin_t *plugin)
     pthread_rwlock_wrlock(&plugin->plugin_mutex);
 
     stop_consumer_thread(&plugin->consumer_thread, plugin);
+    pthread_mutex_lock(&plugin->queue_mutex);
     tasks_free(&plugin->task_queue);
+    pthread_mutex_unlock(&plugin->queue_mutex);
+    pthread_mutex_destroy(&plugin->queue_mutex);
+    pthread_cond_destroy(&plugin->queue_not_empty);
     datalayers_config_fini(&plugin->config);
 
     route_tbl_free(plugin->route_tbl);
@@ -149,7 +160,9 @@ int datalayers_plugin_config(neu_plugin_t *plugin, const char *setting)
     datalayers_config_t config      = { 0 };
     if (plugin->client != NULL) {
         stop_consumer_thread(&plugin->consumer_thread, plugin);
+        pthread_mutex_lock(&plugin->queue_mutex);
         tasks_free(&plugin->task_queue);
+        pthread_mutex_unlock(&plugin->queue_mutex);
         client_destroy(plugin->client);
         plugin->client = NULL;
         create_consumer_thread(plugin);

plugins/modbus/modbus-rtu.json

@@ -18,11 +18,11 @@
 		},
 		{
 			"type": 7,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 8,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 9,
@@ -30,7 +30,7 @@
 		},
 		{
 			"type": 10,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 11,
@@ -158,8 +158,8 @@
 		}
 	},
 	"endianess": {
-		"name": "Endianess",
-		"name_zh": "字节序",
+		"name": "Endianess of 4-Byte Data",
+		"name_zh": "4 字节数据字节序",
 		"description": "Tag byte order, ABCD corresponds to 1234",
 		"description_zh": "点位字节序，ABCD 对应 1234",
 		"attribute": "required",
@@ -186,6 +186,35 @@
 			]
 		}
 	},
+	"endianess_64": {
+		"name": "Endianess of 8-Byte Data",
+		"name_zh": "8 字节数据字节序",
+		"description": "Tag byte order, applicable to int64, uint64 and double types",
+		"description_zh": "点位字节序，适用于 int64，uint64 和 double 类型",
+		"attribute": "required",
+		"type": "map",
+		"default": 1,
+		"valid": {
+			"map": [
+				{
+					"key": "12 34 56 78",
+					"value": 1
+				},
+				{
+					"key": "21 43 65 87",
+					"value": 2
+				},
+				{
+					"key": "87 65 43 21",
+					"value": 3
+				},
+				{
+					"key": "78 56 34 12",
+					"value": 4
+				}
+			]
+		}
+	},
 	"address_base": {
 		"name": "Start Address",
 		"name_zh": "开始地址",

plugins/modbus/modbus-tcp.json

@@ -18,11 +18,11 @@
 		},
 		{
 			"type": 7,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 8,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 9,
@@ -30,7 +30,7 @@
 		},
 		{
 			"type": 10,
-			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|)$"
+			"regex": "^[0-9]+![3-4][0-9]+(#B|#L|#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 11,
@@ -166,8 +166,8 @@
 		}
 	},
 	"endianess": {
-		"name": "Endianess",
-		"name_zh": "字节序",
+		"name": "Endianess of 4-Byte Data",
+		"name_zh": "4 字节数据字节序",
 		"description": "Tag byte order, ABCD corresponds to 1234",
 		"description_zh": "点位字节序，ABCD 对应 1234",
 		"attribute": "required",
@@ -194,6 +194,35 @@
 			]
 		}
 	},
+	"endianess_64": {
+		"name": "Endianess of 8-Byte Data",
+		"name_zh": "8 字节数据字节序",
+		"description": "Tag byte order, applicable to int64, uint64 and double types",
+		"description_zh": "点位字节序，适用于 int64，uint64 和 double 类型",
+		"attribute": "required",
+		"type": "map",
+		"default": 1,
+		"valid": {
+			"map": [
+				{
+					"key": "12 34 56 78",
+					"value": 1
+				},
+				{
+					"key": "21 43 65 87",
+					"value": 2
+				},
+				{
+					"key": "87 65 43 21",
+					"value": 3
+				},
+				{
+					"key": "78 56 34 12",
+					"value": 4
+				}
+			]
+		}
+	},
 	"address_base": {
 		"name": "Start Address",
 		"name_zh": "开始地址",

plugins/modbus/modbus.h

@@ -73,6 +73,13 @@ typedef enum modbus_endianess {
     MODBUS_CDAB = 4,
 } modbus_endianess;
 
+typedef enum modbus_endianess_64 {
+    MODBUS_LL = 1, // 12 34 56 78
+    MODBUS_LB = 2, // 21 43 65 87
+    MODBUS_BB = 3, // 87 65 43 21
+    MODBUS_BL = 4, // 78 56 34 12
+} modbus_endianess_64;
+
 typedef enum modbus_address_base {
     base_0 = 0,
     base_1 = 1,

plugins/modbus/modbus_point.c

@@ -238,7 +238,8 @@ modbus_read_cmd_sort_t *modbus_tag_sort(UT_array *tags, uint16_t max_byte)
 }
 
 int cal_n_byte(int type, neu_value_u *value, neu_datatag_addr_option_u option,
-               modbus_endianess endianess, bool default_tag_endian)
+               modbus_endianess endianess, bool default_tag_endian,
+               modbus_endianess_64 endianess_64, bool default_tag_endian_64)
 {
     int n = 0;
     switch (type) {
@@ -260,6 +261,9 @@ int cal_n_byte(int type, neu_value_u *value, neu_datatag_addr_option_u option,
     case NEU_TYPE_DOUBLE:
     case NEU_TYPE_INT64:
     case NEU_TYPE_UINT64:
+        if (default_tag_endian_64) {
+            modbus_convert_endianess_64(value, endianess_64);
+        }
         n          = sizeof(uint64_t);
         value->u64 = neu_htonll(value->u64);
         break;
@@ -293,8 +297,9 @@ int cal_n_byte(int type, neu_value_u *value, neu_datatag_addr_option_u option,
     return n;
 }
 
-modbus_write_cmd_sort_t *modbus_write_tags_sort(UT_array *       tags,
-                                                modbus_endianess endianess)
+modbus_write_cmd_sort_t *
+modbus_write_tags_sort(UT_array *tags, modbus_endianess endianess,
+                       modbus_endianess_64 endianess_64)
 {
     neu_tag_sort_result_t *result =
         neu_tag_sort(tags, tag_sort_write, tag_cmp_write);
@@ -316,17 +321,18 @@ modbus_write_cmd_sort_t *modbus_write_tags_sort(UT_array *       tags,
         utarray_foreach(result->sorts[i].tags, modbus_point_write_t **, tag_s)
         {
             if ((*tag_s)->point.area == MODBUS_AREA_COIL) {
-                n_byte_tag =
-                    cal_n_byte((*tag_s)->point.type, &(*tag_s)->value,
-                               (*tag_s)->point.option, endianess, true);
+                n_byte_tag = cal_n_byte((*tag_s)->point.type, &(*tag_s)->value,
+                                        (*tag_s)->point.option, endianess, true,
+                                        endianess_64, true);
                 data_bit[k / 8] += ((*tag_s)->value.i8) << k % 8;
                 n_byte += n_byte_tag;
                 k++;
             } else {
-                n_byte_tag =
-                    cal_n_byte((*tag_s)->point.type, &(*tag_s)->value,
-                               (*tag_s)->point.option, endianess,
-                               (*tag_s)->point.option.value32.is_default);
+                n_byte_tag = cal_n_byte(
+                    (*tag_s)->point.type, &(*tag_s)->value,
+                    (*tag_s)->point.option, endianess,
+                    (*tag_s)->point.option.value32.is_default, endianess_64,
+                    (*tag_s)->point.option.value64.is_default);
                 memcpy(sort_result->cmd[i].bytes +
                            2 *
                                ((*tag_s)->point.start_address -
@@ -558,4 +564,24 @@ void modbus_convert_endianess(neu_value_u *value, modbus_endianess endianess)
     default:
         break;
     }
+}
+
+void modbus_convert_endianess_64(neu_value_u *       value,
+                                 modbus_endianess_64 endianess_64)
+{
+    switch (endianess_64) {
+    case MODBUS_LL:
+        break;
+    case MODBUS_BB:
+        value->u64 = neu_htonll(value->u64);
+        break;
+    case MODBUS_LB:
+        value->u64 = neu_htonlb(value->u64);
+        break;
+    case MODBUS_BL:
+        value->u64 = neu_htonbl(value->u64);
+        break;
+    default:
+        break;
+    }
 }

plugins/modbus/modbus_point.h

@@ -81,12 +81,15 @@ typedef struct modbus_write_cmd_sort {
     modbus_write_cmd_t *cmd;
 } modbus_write_cmd_sort_t;
 
-modbus_read_cmd_sort_t * modbus_tag_sort(UT_array *tags, uint16_t max_byte);
-modbus_write_cmd_sort_t *modbus_write_tags_sort(UT_array *       tags,
-                                                modbus_endianess endianess);
-void                     modbus_tag_sort_free(modbus_read_cmd_sort_t *cs);
+modbus_read_cmd_sort_t *modbus_tag_sort(UT_array *tags, uint16_t max_byte);
+modbus_write_cmd_sort_t *
+     modbus_write_tags_sort(UT_array *tags, modbus_endianess endianess,
+                            modbus_endianess_64 endianess_64);
+void modbus_tag_sort_free(modbus_read_cmd_sort_t *cs);
 
 void modbus_convert_endianess(neu_value_u *value, modbus_endianess endianess);
+void modbus_convert_endianess_64(neu_value_u *       value,
+                                 modbus_endianess_64 endianess_64);
 
 #ifdef __cplusplus
 }

plugins/modbus/modbus_req.c

@@ -472,6 +472,10 @@ int modbus_value_handle(void *ctx, uint8_t slave_id, uint16_t n_byte,
             case NEU_TYPE_DOUBLE:
             case NEU_TYPE_INT64:
             case NEU_TYPE_UINT64:
+                if ((*p_tag)->option.value64.is_default) {
+                    modbus_convert_endianess_64(&dvalue.value,
+                                                plugin->endianess_64);
+                }
                 dvalue.value.u64 = neu_ntohll(dvalue.value.u64);
                 break;
             case NEU_TYPE_BIT: {
@@ -729,6 +733,9 @@ static uint8_t convert_value(neu_plugin_t *plugin, neu_value_u *value,
     case NEU_TYPE_DOUBLE:
     case NEU_TYPE_INT64:
     case NEU_TYPE_UINT64:
+        if (tag->option.value64.is_default) {
+            modbus_convert_endianess_64(value, plugin->endianess_64);
+        }
         value->u64 = neu_htonll(value->u64);
         n_byte     = sizeof(uint64_t);
         break;
@@ -821,7 +828,8 @@ int modbus_write_tags(neu_plugin_t *plugin, void *req, UT_array *tags)
 
         utarray_push_back(gtags->tags, &p);
     }
-    gtags->cmd_sort = modbus_write_tags_sort(gtags->tags, plugin->endianess);
+    gtags->cmd_sort = modbus_write_tags_sort(gtags->tags, plugin->endianess,
+                                             plugin->endianess_64);
     for (uint16_t i = 0; i < gtags->cmd_sort->n_cmd; i++) {
         ret = write_modbus_points(plugin, &gtags->cmd_sort->cmd[i], req);
         if (ret <= 0) {

plugins/modbus/modbus_req.h

@@ -40,6 +40,7 @@ struct neu_plugin {
 
     modbus_protocol_e   protocol;
     modbus_endianess    endianess;
+    modbus_endianess_64 endianess_64;
     modbus_address_base address_base;
 
     uint16_t interval;

plugins/modbus/modbus_rtu.c

@@ -107,7 +107,7 @@ static int driver_init(neu_plugin_t *plugin, bool load)
 {
     (void) load;
     plugin->protocol = MODBUS_PROTOCOL_RTU;
-    plugin->events   = neu_event_new();
+    plugin->events   = neu_event_new(plugin->common.name);
     plugin->stack    = modbus_stack_create((void *) plugin, MODBUS_PROTOCOL_RTU,
                                         modbus_send_msg, modbus_value_handle,
                                         modbus_write_resp);
@@ -183,6 +183,9 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
     neu_json_elem_t address_base = { .name = "address_base",
                                      .t    = NEU_JSON_INT };
 
+    neu_json_elem_t endianess_64 = { .name = "endianess_64",
+                                     .t    = NEU_JSON_INT };
+
     ret = neu_parse_param((char *) config, &err_param, 3, &link, &timeout,
                           &interval);
     if (ret != 0) {
@@ -244,6 +247,12 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
         address_base.v.val_int = base_1;
     }
 
+    ret = neu_parse_param((char *) config, &err_param, 1, &endianess_64);
+    if (ret != 0) {
+        free(err_param);
+        endianess_64.v.val_int = MODBUS_LL;
+    }
+
     param.log              = plugin->common.log;
     plugin->max_retries    = max_retries.v.val_int;
     plugin->retry_interval = retry_interval.v.val_int;
@@ -252,6 +261,7 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
     plugin->degrade_time   = degrade_time.v.val_int;
     plugin->endianess      = endianess.v.val_int;
     plugin->address_base   = address_base.v.val_int;
+    plugin->endianess_64   = endianess_64.v.val_int;
 
     if (link.v.val_int == 0) {
         param.type = NEU_CONN_TTY_CLIENT;

plugins/modbus/modbus_tcp.c

@@ -110,7 +110,7 @@ static int driver_init(neu_plugin_t *plugin, bool load)
 {
     (void) load;
     plugin->protocol = MODBUS_PROTOCOL_TCP;
-    plugin->events   = neu_event_new();
+    plugin->events   = neu_event_new(plugin->common.name);
     plugin->stack    = modbus_stack_create((void *) plugin, MODBUS_PROTOCOL_TCP,
                                         modbus_send_msg, modbus_value_handle,
                                         modbus_write_resp);
@@ -190,6 +190,8 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
     neu_json_elem_t endianess    = { .name = "endianess", .t = NEU_JSON_INT };
     neu_json_elem_t address_base = { .name = "address_base",
                                      .t    = NEU_JSON_INT };
+    neu_json_elem_t endianess_64 = { .name = "endianess_64",
+                                     .t    = NEU_JSON_INT };
 
     neu_json_elem_t  backup_ip   = { .name      = "backup_host",
                                   .t         = NEU_JSON_STR,
@@ -260,6 +262,12 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
         backup = true;
     }
 
+    ret = neu_parse_param((char *) config, &err_param, 1, &endianess_64);
+    if (ret != 0) {
+        free(err_param);
+        endianess_64.v.val_int = MODBUS_LL;
+    }
+
     param.log              = plugin->common.log;
     param_backup.log       = plugin->common.log;
     plugin->interval       = interval.v.val_int;
@@ -270,6 +278,7 @@ static int driver_config(neu_plugin_t *plugin, const char *config)
     plugin->degrade_cycle  = degrade_cycle.v.val_int;
     plugin->degrade_time   = degrade_time.v.val_int;
     plugin->endianess      = endianess.v.val_int;
+    plugin->endianess_64   = endianess_64.v.val_int;
     plugin->address_base   = address_base.v.val_int;
 
     if (mode.v.val_int == 1) {

plugins/monitor/monitor.c

@@ -137,7 +137,7 @@ static int start_hearbeat_timer(neu_plugin_t *plugin, uint64_t interval)
     }
 
     if (NULL == plugin->events) {
-        plugin->events = neu_event_new();
+        plugin->events = neu_event_new(plugin->common.name);
         if (NULL == plugin->events) {
             plog_error(plugin, "neu_event_new fail");
             return NEU_ERR_EINTERNAL;

plugins/mqtt/azure_iot_plugin.c

@@ -184,6 +184,7 @@ static int azure_parse_config(neu_plugin_t *plugin, const char *setting,
     config->cert                = cert.v.val_str;
     config->key                 = key.v.val_str;
     config->upload_drv_state    = false;
+    config->enable_topic        = true;
 
     plog_notice(plugin, "config MQTT version    : %d", config->version);
     plog_notice(plugin, "config client-id       : %s", config->client_id);

plugins/mqtt/mqtt.json

@@ -109,6 +109,16 @@
 		"default": true,
 		"valid": {}
 	},
+	"enable_topic": {
+		"name": "Enable driver topic",
+		"name_zh": "启动驱动相关主题",
+		"description": "Subscription driver related topics, including read/req, write/req and action/req.",
+		"description_zh": "是否订阅驱动相关主题，包括 read/req、write/req 和 action/req。",
+		"attribute": "optional",
+		"type": "bool",
+		"default": true,
+		"valid": {}
+	},
 	"write-req-topic": {
 		"name": "Write Request Topic",
 		"name_zh": "写请求主题",
@@ -116,7 +126,7 @@
 		"description_zh": "接收点位写入请求的 MQTT 主题。",
 		"attribute": "required",
 		"type": "string",
-		"default": "/neuron/${random_str}/write/req",
+		"default": "neuron/${random_str}/write/req",
 		"valid": {
 			"length": 255
 		}
@@ -128,7 +138,7 @@
 		"description_zh": "发送点位写入响应的 MQTT 主题。",
 		"attribute": "required",
 		"type": "string",
-		"default": "/neuron/${random_str}/write/resp",
+		"default": "neuron/${random_str}/write/resp",
 		"valid": {
 			"length": 255
 		}
@@ -139,7 +149,7 @@
 		"description": "MQTT topic prefix for driver function.",
 		"attribute": "required",
 		"type": "string",
-		"default": "/neuron/${random_str}",
+		"default": "neuron/${random_str}",
 		"valid": {
 			"length": 128
 		}
@@ -163,7 +173,7 @@
 			"field": "upload_drv_state",
 			"value": true
 		},
-		"default": "/neuron/${random_str}/state/update",
+		"default": "neuron/${random_str}/state/update",
 		"valid": {
 			"length": 255
 		}

plugins/mqtt/mqtt_config.c

@@ -291,13 +291,19 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting,
                                             .t    = NEU_JSON_INT };
     neu_json_elem_t host                = { .name = "host", .t = NEU_JSON_STR };
     neu_json_elem_t port                = { .name = "port", .t = NEU_JSON_INT };
-    neu_json_elem_t username = { .name = "username", .t = NEU_JSON_STR };
-    neu_json_elem_t password = { .name = "password", .t = NEU_JSON_STR };
-    neu_json_elem_t ssl      = { .name = "ssl", .t = NEU_JSON_BOOL };
-    neu_json_elem_t ca       = { .name = "ca", .t = NEU_JSON_STR };
-    neu_json_elem_t cert     = { .name = "cert", .t = NEU_JSON_STR };
-    neu_json_elem_t key      = { .name = "key", .t = NEU_JSON_STR };
-    neu_json_elem_t keypass  = { .name = "keypass", .t = NEU_JSON_STR };
+    neu_json_elem_t username     = { .name = "username", .t = NEU_JSON_STR };
+    neu_json_elem_t password     = { .name = "password", .t = NEU_JSON_STR };
+    neu_json_elem_t ssl          = { .name = "ssl", .t = NEU_JSON_BOOL };
+    neu_json_elem_t ca           = { .name = "ca", .t = NEU_JSON_STR };
+    neu_json_elem_t cert         = { .name = "cert", .t = NEU_JSON_STR };
+    neu_json_elem_t key          = { .name = "key", .t = NEU_JSON_STR };
+    neu_json_elem_t keypass      = { .name = "keypass", .t = NEU_JSON_STR };
+    neu_json_elem_t enable_topic = {
+        .name       = "enable_topic",
+        .t          = NEU_JSON_BOOL,
+        .v.val_bool = true,
+        .attribute  = NEU_JSON_ATTRIBUTE_OPTIONAL,
+    };
     neu_json_elem_t upload_drv_state = {
         .name       = "upload_drv_state",
         .t          = NEU_JSON_BOOL,
@@ -374,6 +380,11 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting,
         free(schema.v.val_str);
     }
 
+    ret = neu_parse_param(setting, &err_param, 1, &enable_topic);
+    if (0 != ret) {
+        enable_topic.v.val_bool = true; // default to true
+    }
+
     ret = neu_parse_param(setting, &err_param, 1, &driver_topic_prefix);
     if (0 != ret) {
         plog_warn(plugin, "parsing driver topic prefix fail, key: `%s`",
@@ -456,6 +467,7 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting,
     config->client_id           = client_id.v.val_str;
     config->qos                 = qos.v.val_int;
     config->format              = format.v.val_int;
+    config->enable_topic        = enable_topic.v.val_bool;
     config->write_req_topic     = write_req_topic.v.val_str;
     config->write_resp_topic    = write_resp_topic.v.val_str;
     config->cache               = offline_cache.v.val_bool;
@@ -483,6 +495,7 @@ int mqtt_config_parse(neu_plugin_t *plugin, const char *setting,
     plog_notice(plugin, "config qos             : %d", config->qos);
     plog_notice(plugin, "config format          : %s",
                 mqtt_upload_format_str(config->format));
+    plog_notice(plugin, "config enable-topic    : %d", config->enable_topic);
     plog_notice(plugin, "config write-req-topic : %s", config->write_req_topic);
     plog_notice(plugin, "config write-resp-topic: %s",
                 config->write_resp_topic);

plugins/mqtt/mqtt_config.h

@@ -94,13 +94,14 @@ typedef struct {
 } mqtt_driver_topic_t;
 
 typedef struct {
-    neu_mqtt_version_e   version;          // mqtt version
-    char *               client_id;        // client id
-    neu_mqtt_qos_e       qos;              // message QoS
-    mqtt_upload_format_e format;           // upload format
-    char *               write_req_topic;  // write request topic
-    char *               write_resp_topic; // write response topic
+    neu_mqtt_version_e   version;   // mqtt version
+    char *               client_id; // client id
+    neu_mqtt_qos_e       qos;       // message QoS
+    mqtt_upload_format_e format;    // upload format
 
+    bool                enable_topic;        // default true
+    char *              write_req_topic;     // write request topic
+    char *              write_resp_topic;    // write response topic
     char *              driver_topic_prefix; // driver topic prefix
     mqtt_driver_topic_t driver_topic;
 
@@ -123,7 +124,6 @@ typedef struct {
     char *   keypass;             // client key password
                                   // remove in 2.6, keep it here
                                   // for backward compatibility
-
     size_t            n_schema_vt;
     mqtt_schema_vt_t *schema_vts;
 } mqtt_config_t;

plugins/mqtt/mqtt_handle.c

@@ -1186,7 +1186,7 @@ int handle_read_response(neu_plugin_t *plugin, neu_json_mqtt_t *mqtt_json,
                 break;
             }
 
-            for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
+            for (int i = 0; i < tag_value->n_meta; i++) {
                 if (strlen(tag_value->metas[i].name) > 0) {
                     if (strncmp(tag_value->metas[i].name, "q", 1) == 0) {
                         tag->has_q = true;
@@ -1416,7 +1416,7 @@ int handle_trans_data(neu_plugin_t *            plugin,
                     break;
                 }
 
-                for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
+                for (int i = 0; i < tag_value->n_meta; i++) {
                     if (strlen(tag_value->metas[i].name) > 0) {
                         if (strncmp(tag_value->metas[i].name, "q", 1) == 0) {
                             tag->has_q = true;
@@ -1491,7 +1491,9 @@ int handle_trans_data(neu_plugin_t *            plugin,
                 plugin, trans_data, plugin->config.format,
                 plugin->config.schema_vts, plugin->config.n_schema_vt,
                 static_tags, n_satic_tag, &skip_none);
-            size = strlen(json_str);
+            if (json_str != NULL) {
+                size = strlen(json_str);
+            }
         }
         if (n_satic_tag > 0) {
             mqtt_static_free(static_tags, n_satic_tag);

plugins/mqtt/mqtt_plugin_intf.c

@@ -62,7 +62,7 @@ static int start_hearbeat_timer(neu_plugin_t *plugin, uint64_t interval)
     }
 
     if (NULL == plugin->events) {
-        plugin->events = neu_event_new();
+        plugin->events = neu_event_new(plugin->common.name);
         if (NULL == plugin->events) {
             plog_error(plugin, "neu_event_new fail");
             return NEU_ERR_EINTERNAL;
@@ -265,13 +265,13 @@ static int create_topic(neu_plugin_t *plugin)
         return 0;
     }
 
-    neu_asprintf(&plugin->read_req_topic, "/neuron/%s/read/req",
+    neu_asprintf(&plugin->read_req_topic, "neuron/%s/read/req",
                  plugin->common.name);
     if (NULL == plugin->read_req_topic) {
         return -1;
     }
 
-    neu_asprintf(&plugin->read_resp_topic, "/neuron/%s/read/resp",
+    neu_asprintf(&plugin->read_resp_topic, "neuron/%s/read/resp",
                  plugin->common.name);
     if (NULL == plugin->read_resp_topic) {
         free(plugin->read_req_topic);
@@ -387,7 +387,6 @@ int mqtt_plugin_config(neu_plugin_t *plugin, const char *setting)
     int           rv          = 0;
     const char *  plugin_name = neu_plugin_module.module_name;
     mqtt_config_t config      = { 0 };
-    bool          started     = false;
 
     rv = plugin->parse_config(plugin, setting, &config);
     if (0 != rv) {
@@ -395,33 +394,11 @@ int mqtt_plugin_config(neu_plugin_t *plugin, const char *setting)
         return NEU_ERR_NODE_SETTING_INVALID;
     }
 
-    if (NULL == plugin->client) {
-        plugin->client = neu_mqtt_client_new(config.version);
-        if (NULL == plugin->client) {
-            plog_error(plugin, "neu_mqtt_client_new fail");
-            rv = NEU_ERR_EINTERNAL;
-            goto error;
-        }
-    } else if (neu_mqtt_client_is_open(plugin->client)) {
-        started = true;
-        plugin->unsubscribe(plugin, &plugin->config);
-        rv = neu_mqtt_client_close(plugin->client);
-        if (0 != rv) {
-            plog_error(plugin, "neu_mqtt_client_close fail");
-            rv = NEU_ERR_EINTERNAL;
-            goto error;
-        }
-        if (neu_mqtt_client_check_version_change(plugin->client,
-                                                 config.version)) {
-            neu_mqtt_client_free(plugin->client);
-            plugin->client = neu_mqtt_client_new(config.version);
-        }
-    } else if (neu_mqtt_client_check_version_change(plugin->client,
-                                                    config.version)) {
-        // plugin stopped and version changed
+    if (plugin->client != NULL) {
+        neu_mqtt_client_close(plugin->client);
         neu_mqtt_client_free(plugin->client);
-        plugin->client = neu_mqtt_client_new(config.version);
     }
+    plugin->client = neu_mqtt_client_new(config.version);
 
     rv = config_mqtt_client(plugin, plugin->client, &config);
     if (0 != rv) {
@@ -429,17 +406,17 @@ int mqtt_plugin_config(neu_plugin_t *plugin, const char *setting)
         goto error;
     }
 
-    if (started) {
-        if (0 != neu_mqtt_client_open(plugin->client)) {
-            plog_error(plugin, "neu_mqtt_client_open fail");
-            rv = NEU_ERR_MQTT_CONNECT_FAILURE;
-            goto error;
-        }
-        if (0 != start_hearbeat_timer(plugin, config.heartbeat_interval)) {
-            plog_error(plugin, "start hearbeat_timer failed");
-            rv = NEU_ERR_EINTERNAL;
-            goto error;
-        }
+    if (0 != neu_mqtt_client_open(plugin->client)) {
+        plog_error(plugin, "neu_mqtt_client_open fail");
+        rv = NEU_ERR_MQTT_CONNECT_FAILURE;
+        goto error;
+    }
+    if (0 != start_hearbeat_timer(plugin, config.heartbeat_interval)) {
+        plog_error(plugin, "start hearbeat_timer failed");
+        rv = NEU_ERR_EINTERNAL;
+        goto error;
+    }
+    if (config.enable_topic) {
         if (0 != (rv = plugin->subscribe(plugin, &config))) {
             goto error;
         }
@@ -483,7 +460,10 @@ int mqtt_plugin_start(neu_plugin_t *plugin)
         goto end;
     }
 
-    rv = plugin->subscribe(plugin, &plugin->config);
+    rv = 0;
+    if (plugin->config.enable_topic) {
+        rv = plugin->subscribe(plugin, &plugin->config);
+    }
 
 end:
     if (0 == rv) {
@@ -499,7 +479,9 @@ end:
 int mqtt_plugin_stop(neu_plugin_t *plugin)
 {
     if (plugin->client) {
-        plugin->unsubscribe(plugin, &plugin->config);
+        if (plugin->config.enable_topic) {
+            plugin->unsubscribe(plugin, &plugin->config);
+        }
         neu_mqtt_client_close(plugin->client);
         plog_notice(plugin, "mqtt client closed");
     }

plugins/restful/group_config_handle.c

@@ -406,10 +406,16 @@ void handle_grp_subscribes(nng_aio *aio)
     NEU_PROCESS_HTTP_REQUEST_VALIDATE_JWT(
         aio, neu_json_subscribe_groups_req_t,
         neu_json_decode_subscribe_groups_req, {
-            int ret = send_subscribe_groups(aio, req);
-            if (0 != ret) {
+            int ret = 0;
+            if (req->n_group == 0) {
                 NEU_JSON_RESPONSE_ERROR(
                     ret, { neu_http_response(aio, ret, result_error); });
+            } else {
+                ret = send_subscribe_groups(aio, req);
+                if (0 != ret) {
+                    NEU_JSON_RESPONSE_ERROR(
+                        ret, { neu_http_response(aio, ret, result_error); });
+                }
             }
         })
 }
@@ -488,4 +494,111 @@ void handle_grp_get_subscribe_resp(nng_aio *                       aio,
     free(result);
     free(sub_grp_configs.groups);
     utarray_free(groups->groups);
+}
+
+void handle_grp_get_subscribes(nng_aio *aio)
+{
+    int                                  ret    = 0;
+    neu_plugin_t *                       plugin = neu_rest_get_plugin();
+    neu_req_get_driver_subscribe_group_t cmd    = { 0 };
+    neu_reqresp_head_t                   header = {
+        .ctx             = aio,
+        .type            = NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP,
+        .otel_trace_type = NEU_OTEL_TRACE_TYPE_REST_COMM,
+    };
+
+    NEU_VALIDATE_JWT(aio);
+
+    // required parameter
+    ret = neu_http_get_param_str(aio, "app", cmd.app, sizeof(cmd.app));
+    if (ret <= 0) {
+        NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
+            neu_http_response(aio, error_code.error, result_error);
+        })
+        return;
+    }
+
+    // optional parameter
+    ret = neu_http_get_param_str(aio, "name", cmd.name, sizeof(cmd.name));
+    if (-1 == ret || (size_t) ret == sizeof(cmd.name)) {
+        NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
+            neu_http_response(aio, error_code.error, result_error);
+        })
+        return;
+    }
+
+    ret = neu_plugin_op(plugin, header, &cmd);
+    if (ret != 0) {
+        NEU_JSON_RESPONSE_ERROR(NEU_ERR_IS_BUSY, {
+            neu_http_response(aio, NEU_ERR_IS_BUSY, result_error);
+        });
+    }
+}
+
+void handle_grp_get_subscribes_resp(nng_aio *                       aio,
+                                    neu_resp_get_subscribe_group_t *drivers)
+{
+    char *                               result       = NULL;
+    neu_json_get_driver_subscribe_resp_t drivers_resp = { 0 };
+
+    utarray_foreach(drivers->groups, neu_resp_driver_subscribe_info_t *, group)
+    {
+        // int  index = utarray_eltidx(drivers->groups, group);
+        bool found = false;
+
+        for (int k = 0; k < drivers_resp.n_driver; k++) {
+            if (strcmp(drivers_resp.drivers[k].driver, group->driver) == 0) {
+                found = true;
+                drivers_resp.drivers[k].n_group++;
+                drivers_resp.drivers[k].groups = realloc(
+                    drivers_resp.drivers[k].groups,
+                    drivers_resp.drivers[k].n_group *
+                        sizeof(neu_json_get_driver_subscribe_resp_group_t));
+                drivers_resp.drivers[k]
+                    .groups[drivers_resp.drivers[k].n_group - 1]
+                    .group = strdup(group->group);
+                drivers_resp.drivers[k]
+                    .groups[drivers_resp.drivers[k].n_group - 1]
+                    .subscribed = group->subscribed;
+                break;
+            }
+        }
+
+        if (!found) {
+            drivers_resp.n_driver++;
+            drivers_resp.drivers = realloc(
+                drivers_resp.drivers,
+                drivers_resp.n_driver *
+                    sizeof(neu_json_get_driver_subscribe_resp_driver_t));
+
+            drivers_resp.drivers[drivers_resp.n_driver - 1].driver =
+                strdup(group->driver);
+            drivers_resp.drivers[drivers_resp.n_driver - 1].n_group = 1;
+            drivers_resp.drivers[drivers_resp.n_driver - 1].groups =
+                calloc(1, sizeof(neu_json_get_driver_subscribe_resp_group_t));
+
+            drivers_resp.drivers[drivers_resp.n_driver - 1].groups[0].group =
+                strdup(group->group);
+            drivers_resp.drivers[drivers_resp.n_driver - 1]
+                .groups[0]
+                .subscribed = group->subscribed;
+        }
+    }
+
+    neu_json_encode_by_fn(&drivers_resp,
+                          neu_json_encode_get_driver_subscribe_resp, &result);
+
+    neu_http_ok(aio, result);
+    free(result);
+
+    for (int i = 0; i < drivers_resp.n_driver; i++) {
+        free(drivers_resp.drivers[i].driver);
+        for (int j = 0; j < drivers_resp.drivers[i].n_group; j++) {
+            free(drivers_resp.drivers[i].groups[j].group);
+        }
+        free(drivers_resp.drivers[i].groups);
+    }
+    free(drivers_resp.drivers);
+
+    utarray_free(drivers->groups);
 }

plugins/restful/group_config_handle.h

@@ -39,4 +39,8 @@ void handle_grp_get_subscribe(nng_aio *aio);
 void handle_grp_get_subscribe_resp(nng_aio *                       aio,
                                    neu_resp_get_subscribe_group_t *groups);
 
+void handle_grp_get_subscribes(nng_aio *aio);
+void handle_grp_get_subscribes_resp(nng_aio *                       aio,
+                                    neu_resp_get_subscribe_group_t *groups);
+
 #endif

plugins/restful/handle.c

@@ -360,6 +360,12 @@ static struct neu_http_handler rest_handlers[] = {
         .url           = "/api/v2/subscribe",
         .value.handler = handle_grp_get_subscribe,
     },
+    {
+        .method        = NEU_HTTP_METHOD_GET,
+        .type          = NEU_HTTP_HANDLER_FUNCTION,
+        .url           = "/api/v2/subscribes",
+        .value.handler = handle_grp_get_subscribes,
+    },
     {
         .method        = NEU_HTTP_METHOD_POST,
         .type          = NEU_HTTP_HANDLER_FUNCTION,

plugins/restful/rest.c

@@ -305,6 +305,13 @@ static int dashb_plugin_request(neu_plugin_t *      plugin,
             neu_otel_scope_set_status_code2(scope, NEU_OTEL_STATUS_OK, 0);
         }
         break;
+    case NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP:
+        handle_grp_get_subscribes_resp(header->ctx,
+                                       (neu_resp_get_subscribe_group_t *) data);
+        if (neu_otel_control_is_started() && trace) {
+            neu_otel_scope_set_status_code2(scope, NEU_OTEL_STATUS_OK, 0);
+        }
+        break;
     case NEU_RESP_GET_NODE_SETTING:
         handle_get_node_setting_resp(header->ctx,
                                      (neu_resp_get_node_setting_t *) data);

simulator/modbus_simulator.c

@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
         .params.tcp_server.stop_listen  = stop_listen,
     };
 
-    events = neu_event_new();
+    events = neu_event_new("modbus_simulator");
     conn   = neu_conn_new(&param, NULL, connected, disconnected);
 
     signal(SIGINT, sig_handler);

simulator/modbus_tty_simulator.c

@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
         .params.tty_client.timeout = 3000,
     };
 
-    events = neu_event_new();
+    events = neu_event_new("modbus_tty_simulator");
     conn   = neu_conn_new(&param, NULL, connected, disconnected);
 
     neu_conn_start(conn);

src/adapter/adapter.c

@@ -202,7 +202,7 @@ neu_adapter_t *neu_adapter_create(neu_adapter_info_t *info, bool load)
     }
 
     adapter->name                    = strdup(info->name);
-    adapter->events                  = neu_event_new();
+    adapter->events                  = neu_event_new("adapter");
     adapter->state                   = NEU_NODE_RUNNING_STATE_INIT;
     adapter->handle                  = info->handle;
     adapter->cb_funs.command         = callback_funs.command;
@@ -766,6 +766,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
     case NEU_RESP_GET_NODE_SETTING:
     case NEU_REQ_UPDATE_GROUP:
     case NEU_RESP_GET_SUBSCRIBE_GROUP:
+    case NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP:
     case NEU_RESP_GET_DATALAYERS_GROUPS:
     case NEU_RESP_GET_DATALAYERS_TAGS:
     case NEU_RESP_GET_DATALAYERS_TAG:

src/adapter/driver/cache.c

@@ -45,7 +45,8 @@ struct elem {
     neu_dvalue_t value;
     neu_dvalue_t value_old;
 
-    neu_tag_meta_t metas[NEU_TAG_META_SIZE];
+    neu_tag_meta_t *metas;
+    int             n_meta;
 
     tkey_t         key;
     UT_hash_handle hh;
@@ -115,6 +116,13 @@ void neu_driver_cache_destroy(neu_driver_cache_t *cache)
             free(elem->value.value.bools.bools);
         }
 
+        if (elem->metas != NULL) {
+            for (int i = 0; i < elem->n_meta; i++) {
+                neu_free_dvalue(&elem->metas[i].value);
+            }
+            free(elem->metas);
+        }
+
         free(elem);
     }
 
@@ -764,9 +772,16 @@ void neu_driver_cache_update_change(neu_driver_cache_t *cache,
         }
         elem->value.type = value.type;
 
-        memset(elem->metas, 0, sizeof(neu_tag_meta_t) * NEU_TAG_META_SIZE);
-        for (int i = 0; i < n_meta; i++) {
-            memcpy(&elem->metas[i], &metas[i], sizeof(neu_tag_meta_t));
+        if (metas != NULL && n_meta != 0) {
+            if (elem->metas != NULL) {
+                free(elem->metas);
+            }
+            elem->metas = calloc(n_meta, sizeof(neu_tag_meta_t));
+            for (int i = 0; i < n_meta; i++) {
+                memcpy(&elem->metas[i], &metas[i], sizeof(neu_tag_meta_t));
+            }
+
+            elem->n_meta = n_meta;
         }
     }
 
@@ -784,7 +799,7 @@ void neu_driver_cache_update(neu_driver_cache_t *cache, const char *group,
 
 int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
                               const char *tag, neu_driver_cache_value_t *value,
-                              neu_tag_meta_t *metas, int n_meta)
+                              neu_tag_meta_t **metas, int *n_meta)
 {
     struct elem *elem = NULL;
     int          ret  = -1;
@@ -798,8 +813,14 @@ int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
         value->value.type      = elem->value.type;
         value->value.precision = elem->value.precision;
 
-        assert(n_meta <= NEU_TAG_META_SIZE);
-        memcpy(metas, elem->metas, sizeof(neu_tag_meta_t) * NEU_TAG_META_SIZE);
+        // assert(n_meta <= NEU_TAG_META_SIZE);
+        if (elem->metas) {
+            *metas = calloc(elem->n_meta, sizeof(neu_tag_meta_t));
+            memcpy(*metas, elem->metas, sizeof(neu_tag_meta_t) * elem->n_meta);
+        } else {
+            *metas = NULL;
+        }
+        *n_meta = elem->n_meta;
 
         switch (elem->value.type) {
         case NEU_TYPE_INT8:
@@ -941,13 +962,6 @@ int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
             break;
         }
 
-        for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (strlen(elem->metas[i].name) > 0) {
-                memcpy(&value->metas[i], &elem->metas[i],
-                       sizeof(neu_tag_meta_t));
-            }
-        }
-
         ret = 0;
     }
 
@@ -959,7 +973,7 @@ int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
 int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
                                       const char *group, const char *tag,
                                       neu_driver_cache_value_t *value,
-                                      neu_tag_meta_t *metas, int n_meta)
+                                      neu_tag_meta_t **metas, int *n_meta)
 {
     struct elem *elem = NULL;
     int          ret  = -1;
@@ -973,8 +987,14 @@ int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
         value->value.type      = elem->value.type;
         value->value.precision = elem->value.precision;
 
-        assert(n_meta <= NEU_TAG_META_SIZE);
-        memcpy(metas, elem->metas, sizeof(neu_tag_meta_t) * NEU_TAG_META_SIZE);
+        // assert(n_meta <= NEU_TAG_META_SIZE);
+        if (elem->metas) {
+            *metas = calloc(elem->n_meta, sizeof(neu_tag_meta_t));
+            memcpy(*metas, elem->metas, sizeof(neu_tag_meta_t) * elem->n_meta);
+        } else {
+            *metas = NULL;
+        }
+        *n_meta = elem->n_meta;
 
         switch (elem->value.type) {
         case NEU_TYPE_INT8:
@@ -1116,13 +1136,6 @@ int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
             break;
         }
 
-        for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (strlen(elem->metas[i].name) > 0) {
-                memcpy(&value->metas[i], &elem->metas[i],
-                       sizeof(neu_tag_meta_t));
-            }
-        }
-
         if (elem->value.type != NEU_TYPE_ERROR) {
             elem->changed = false;
         }
@@ -1165,6 +1178,12 @@ void neu_driver_cache_del(neu_driver_cache_t *cache, const char *group,
                    elem->value.type < NEU_TYPE_ARRAY_STRING) {
             free(elem->value.value.bools.bools);
         }
+        if (elem->metas != NULL) {
+            for (int i = 0; i < elem->n_meta; i++) {
+                neu_free_dvalue(&elem->metas[i].value);
+            }
+            free(elem->metas);
+        }
         free(elem);
     }
 

src/adapter/driver/cache.h

@@ -50,17 +50,16 @@ void neu_driver_cache_update_trace(neu_driver_cache_t *cache, const char *group,
 void *neu_driver_cache_get_trace(neu_driver_cache_t *cache, const char *group);
 
 typedef struct {
-    neu_dvalue_t   value;
-    int64_t        timestamp;
-    neu_tag_meta_t metas[NEU_TAG_META_SIZE];
+    neu_dvalue_t value;
+    int64_t      timestamp;
 } neu_driver_cache_value_t;
 
 int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
                               const char *tag, neu_driver_cache_value_t *value,
-                              neu_tag_meta_t *metas, int n_meta);
+                              neu_tag_meta_t **metas, int *n_meta);
 int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
                                       const char *group, const char *tag,
                                       neu_driver_cache_value_t *value,
-                                      neu_tag_meta_t *metas, int n_meta);
+                                      neu_tag_meta_t **metas, int *n_meta);
 
 #endif

src/adapter/driver/driver.c

@@ -486,6 +486,13 @@ static void update_im(neu_adapter_t *adapter, const char *group,
                 } else {
                     neu_free_dvalue(&tag_value->value);
                 }
+
+                if (tag_value->metas != NULL) {
+                    for (int i = 0; i < tag_value->n_meta; i++) {
+                        neu_free_dvalue(&tag_value->metas[i].value);
+                    }
+                    free(tag_value->metas);
+                }
             }
             utarray_free(data->tags);
             free(data->group);
@@ -537,13 +544,13 @@ neu_adapter_driver_t *neu_adapter_driver_create()
 {
     neu_adapter_driver_t *driver = calloc(1, sizeof(neu_adapter_driver_t));
 
-    driver->cache                                      = neu_driver_cache_new();
-    driver->driver_events                              = neu_event_new();
-    driver->adapter.cb_funs.driver.update              = update;
-    driver->adapter.cb_funs.driver.write_response      = write_response;
-    driver->adapter.cb_funs.driver.write_responses     = write_responses;
-    driver->adapter.cb_funs.driver.directory_response  = directory_response;
-    driver->adapter.cb_funs.driver.fup_open_response   = fup_open_response;
+    driver->cache                                     = neu_driver_cache_new();
+    driver->driver_events                             = neu_event_new("driver");
+    driver->adapter.cb_funs.driver.update             = update;
+    driver->adapter.cb_funs.driver.write_response     = write_response;
+    driver->adapter.cb_funs.driver.write_responses    = write_responses;
+    driver->adapter.cb_funs.driver.directory_response = directory_response;
+    driver->adapter.cb_funs.driver.fup_open_response  = fup_open_response;
     driver->adapter.cb_funs.driver.fdown_open_response = fdown_open_response;
     driver->adapter.cb_funs.driver.fup_data_response   = fup_data_response;
     driver->adapter.cb_funs.driver.update_im           = update_im;
@@ -947,9 +954,17 @@ static void fix_value(neu_datatag_t *tag, neu_type_e value_type,
     case NEU_TYPE_LWORD:
         switch (tag->option.value64.endian) {
         case NEU_DATATAG_ENDIAN_B64:
+        case NEU_DATATAG_ENDIAN_BB64:
             value->value.u64 = neu_ntohll(value->value.u64);
             break;
+        case NEU_DATATAG_ENDIAN_LB64:
+            value->value.u64 = neu_htonlb(value->value.u64);
+            break;
+        case NEU_DATATAG_ENDIAN_BL64:
+            value->value.u64 = neu_htonbl(value->value.u64);
+            break;
         case NEU_DATATAG_ENDIAN_L64:
+        case NEU_DATATAG_ENDIAN_LL64:
         default:
             break;
         }
@@ -2238,6 +2253,7 @@ static int report_callback(void *usr_data)
     data->driver = strdup(group->driver->adapter.name);
     data->group  = strdup(group->name);
     utarray_new(data->tags, neu_resp_tag_value_meta_icd());
+    utarray_reserve(data->tags, utarray_len(tags));
 
     void *trace_ctx =
         neu_driver_cache_get_trace(group->driver->cache, group->name);
@@ -2329,6 +2345,13 @@ static int report_callback(void *usr_data)
                 } else {
                     neu_free_dvalue(&tag_value->value);
                 }
+
+                if (tag_value->metas != NULL) {
+                    for (int i = 0; i < tag_value->n_meta; i++) {
+                        neu_free_dvalue(&tag_value->metas[i].value);
+                    }
+                    free(tag_value->metas);
+                }
             }
             utarray_free(data->tags);
             free(data->group);
@@ -2533,15 +2556,15 @@ static void read_report_group(int64_t timestamp, int64_t timeout,
 
         if (neu_tag_attribute_test(tag, NEU_ATTRIBUTE_SUBSCRIBE)) {
             if (neu_driver_cache_meta_get_changed(cache, group, tag->name,
-                                                  &value, tag_value.metas,
-                                                  NEU_TAG_META_SIZE) != 0) {
+                                                  &value, &tag_value.metas,
+                                                  &tag_value.n_meta) != 0) {
                 nlog_debug("tag: %s not changed", tag->name);
                 continue;
             }
         } else {
             if (neu_driver_cache_meta_get(cache, group, tag->name, &value,
-                                          tag_value.metas,
-                                          NEU_TAG_META_SIZE) != 0) {
+                                          &tag_value.metas,
+                                          &tag_value.n_meta) != 0) {
                 strcpy(tag_value.tag, tag->name);
                 tag_value.value.type      = NEU_TYPE_ERROR;
                 tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_NOT_READY;
@@ -2614,9 +2637,17 @@ static void read_report_group(int64_t timestamp, int64_t timeout,
         case NEU_TYPE_UINT64:
             switch (tag->option.value64.endian) {
             case NEU_DATATAG_ENDIAN_B64:
+            case NEU_DATATAG_ENDIAN_BB64:
                 value.value.value.u64 = neu_htonll(value.value.value.u64);
                 break;
+            case NEU_DATATAG_ENDIAN_LB64:
+                value.value.value.u64 = neu_htonlb(value.value.value.u64);
+                break;
+            case NEU_DATATAG_ENDIAN_BL64:
+                value.value.value.u64 = neu_htonbl(value.value.value.u64);
+                break;
             case NEU_DATATAG_ENDIAN_L64:
+            case NEU_DATATAG_ENDIAN_LL64:
             default:
                 break;
             }
@@ -2720,8 +2751,8 @@ static void read_group(int64_t timestamp, int64_t timeout,
         tag_value.datatag.bias = tag->bias;
 
         if (neu_driver_cache_meta_get(cache, group, tag->name, &value,
-                                      tag_value.metas,
-                                      NEU_TAG_META_SIZE) != 0) {
+                                      &tag_value.metas,
+                                      &tag_value.n_meta) != 0) {
             tag_value.value.type      = NEU_TYPE_ERROR;
             tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_NOT_READY;
 
@@ -2780,9 +2811,17 @@ static void read_group(int64_t timestamp, int64_t timeout,
         case NEU_TYPE_UINT64:
             switch (tag->option.value64.endian) {
             case NEU_DATATAG_ENDIAN_B64:
+            case NEU_DATATAG_ENDIAN_BB64:
                 value.value.value.u64 = neu_htonll(value.value.value.u64);
                 break;
+            case NEU_DATATAG_ENDIAN_LB64:
+                value.value.value.u64 = neu_htonlb(value.value.value.u64);
+                break;
+            case NEU_DATATAG_ENDIAN_BL64:
+                value.value.value.u64 = neu_htonbl(value.value.value.u64);
+                break;
             case NEU_DATATAG_ENDIAN_L64:
+            case NEU_DATATAG_ENDIAN_LL64:
             default:
                 break;
             }
@@ -2900,8 +2939,8 @@ static void read_group_paginate(int64_t timestamp, int64_t timeout,
         }
 
         if (neu_driver_cache_meta_get(cache, group, tag->name, &value,
-                                      tag_value.metas,
-                                      NEU_TAG_META_SIZE) != 0) {
+                                      &tag_value.metas,
+                                      &tag_value.n_meta) != 0) {
             tag_value.value.type      = NEU_TYPE_ERROR;
             tag_value.value.value.i32 = NEU_ERR_PLUGIN_TAG_NOT_READY;
 
@@ -2960,9 +2999,17 @@ static void read_group_paginate(int64_t timestamp, int64_t timeout,
         case NEU_TYPE_UINT64:
             switch (tag->option.value64.endian) {
             case NEU_DATATAG_ENDIAN_B64:
+            case NEU_DATATAG_ENDIAN_BB64:
                 value.value.value.u64 = neu_htonll(value.value.value.u64);
                 break;
+            case NEU_DATATAG_ENDIAN_LB64:
+                value.value.value.u64 = neu_htonlb(value.value.value.u64);
+                break;
+            case NEU_DATATAG_ENDIAN_BL64:
+                value.value.value.u64 = neu_htonbl(value.value.value.u64);
+                break;
             case NEU_DATATAG_ENDIAN_L64:
+            case NEU_DATATAG_ENDIAN_LL64:
             default:
                 break;
             }

src/base/msg_internal.h

@@ -30,113 +30,116 @@ extern "C" {
 
 #include "msg.h"
 
-#define NEU_REQRESP_TYPE_MAP(XX)                                       \
-    XX(NEU_RESP_ERROR, neu_resp_error_t)                               \
-    XX(NEU_REQ_READ_GROUP, neu_req_read_group_t)                       \
-    XX(NEU_RESP_READ_GROUP, neu_resp_read_group_t)                     \
-    XX(NEU_REQ_READ_GROUP_PAGINATE, neu_req_read_group_paginate_t)     \
-    XX(NEU_RESP_READ_GROUP_PAGINATE, neu_resp_read_group_paginate_t)   \
-    XX(NEU_REQ_TEST_READ_TAG, neu_req_test_read_tag_t)                 \
-    XX(NEU_RESP_TEST_READ_TAG, neu_resp_test_read_tag_t)               \
-    XX(NEU_REQ_WRITE_TAG, neu_req_write_tag_t)                         \
-    XX(NEU_REQ_WRITE_TAGS, neu_req_write_tags_t)                       \
-    XX(NEU_REQ_WRITE_GTAGS, neu_req_write_gtags_t)                     \
-    XX(NEU_REQ_SUBSCRIBE_GROUP, neu_req_subscribe_t)                   \
-    XX(NEU_REQ_UNSUBSCRIBE_GROUP, neu_req_unsubscribe_t)               \
-    XX(NEU_REQ_UPDATE_SUBSCRIBE_GROUP, neu_req_subscribe_t)            \
-    XX(NEU_REQ_SUBSCRIBE_GROUPS, neu_req_subscribe_groups_t)           \
-    XX(NEU_REQ_GET_SUBSCRIBE_GROUP, neu_req_get_subscribe_group_t)     \
-    XX(NEU_RESP_GET_SUBSCRIBE_GROUP, neu_resp_get_subscribe_group_t)   \
-    XX(NEU_REQ_GET_SUB_DRIVER_TAGS, neu_req_get_sub_driver_tags_t)     \
-    XX(NEU_RESP_GET_SUB_DRIVER_TAGS, neu_resp_get_sub_driver_tags_t)   \
-    XX(NEU_REQ_NODE_INIT, neu_req_node_init_t)                         \
-    XX(NEU_REQ_NODE_UNINIT, neu_req_node_uninit_t)                     \
-    XX(NEU_RESP_NODE_UNINIT, neu_resp_node_uninit_t)                   \
-    XX(NEU_REQ_ADD_NODE, neu_req_add_node_t)                           \
-    XX(NEU_REQ_UPDATE_NODE, neu_req_update_node_t)                     \
-    XX(NEU_REQ_DEL_NODE, neu_req_del_node_t)                           \
-    XX(NEU_REQ_GET_NODE, neu_req_get_node_t)                           \
-    XX(NEU_RESP_GET_NODE, neu_resp_get_node_t)                         \
-    XX(NEU_REQ_NODE_SETTING, neu_req_node_setting_t)                   \
-    XX(NEU_REQ_GET_NODE_SETTING, neu_req_get_node_setting_t)           \
-    XX(NEU_RESP_GET_NODE_SETTING, neu_resp_get_node_setting_t)         \
-    XX(NEU_REQ_GET_NODE_STATE, neu_req_get_node_state_t)               \
-    XX(NEU_RESP_GET_NODE_STATE, neu_resp_get_node_state_t)             \
-    XX(NEU_REQ_GET_NODES_STATE, neu_req_get_nodes_state_t)             \
-    XX(NEU_RESP_GET_NODES_STATE, neu_resp_get_nodes_state_t)           \
-    XX(NEU_REQ_NODE_CTL, neu_req_node_ctl_t)                           \
-    XX(NEU_REQ_NODE_RENAME, neu_req_node_rename_t)                     \
-    XX(NEU_RESP_NODE_RENAME, neu_resp_node_rename_t)                   \
-    XX(NEU_REQ_ADD_GROUP, neu_req_add_group_t)                         \
-    XX(NEU_REQ_DEL_GROUP, neu_req_del_group_t)                         \
-    XX(NEU_REQ_UPDATE_GROUP, neu_req_update_group_t)                   \
-    XX(NEU_REQ_UPDATE_DRIVER_GROUP, neu_req_update_group_t)            \
-    XX(NEU_RESP_UPDATE_DRIVER_GROUP, neu_resp_update_group_t)          \
-    XX(NEU_REQ_GET_GROUP, neu_req_get_group_t)                         \
-    XX(NEU_RESP_GET_GROUP, neu_resp_get_group_t)                       \
-    XX(NEU_REQ_GET_DRIVER_GROUP, neu_req_get_group_t)                  \
-    XX(NEU_RESP_GET_DRIVER_GROUP, neu_resp_get_driver_group_t)         \
-    XX(NEU_REQ_ADD_TAG, neu_req_add_tag_t)                             \
-    XX(NEU_RESP_ADD_TAG, neu_resp_add_tag_t)                           \
-    XX(NEU_REQ_ADD_GTAG, neu_req_add_gtag_t)                           \
-    XX(NEU_RESP_ADD_GTAG, neu_resp_add_tag_t)                          \
-    XX(NEU_REQ_DEL_TAG, neu_req_del_tag_t)                             \
-    XX(NEU_REQ_UPDATE_TAG, neu_req_update_tag_t)                       \
-    XX(NEU_RESP_UPDATE_TAG, neu_resp_update_tag_t)                     \
-    XX(NEU_REQ_GET_TAG, neu_req_get_tag_t)                             \
-    XX(NEU_RESP_GET_TAG, neu_resp_get_tag_t)                           \
-    XX(NEU_REQ_ADD_PLUGIN, neu_req_add_plugin_t)                       \
-    XX(NEU_REQ_DEL_PLUGIN, neu_req_del_plugin_t)                       \
-    XX(NEU_REQ_UPDATE_PLUGIN, neu_req_update_plugin_t)                 \
-    XX(NEU_REQ_GET_PLUGIN, neu_req_get_plugin_t)                       \
-    XX(NEU_RESP_GET_PLUGIN, neu_resp_get_plugin_t)                     \
-    XX(NEU_REQRESP_TRANS_DATA, neu_reqresp_trans_data_t)               \
-    XX(NEU_REQRESP_NODES_STATE, neu_reqresp_nodes_state_t)             \
-    XX(NEU_REQRESP_NODE_DELETED, neu_reqresp_node_deleted_t)           \
-    XX(NEU_REQ_ADD_DRIVERS, neu_req_driver_array_t)                    \
-    XX(NEU_REQ_UPDATE_LOG_LEVEL, neu_req_update_log_level_t)           \
-    XX(NEU_REQ_PRGFILE_UPLOAD, neu_req_prgfile_upload_t)               \
-    XX(NEU_REQ_PRGFILE_PROCESS, neu_req_prgfile_process_t)             \
-    XX(NEU_RESP_PRGFILE_PROCESS, neu_resp_prgfile_process_t)           \
-    XX(NEU_REQ_SCAN_TAGS, neu_req_scan_tags_t)                         \
-    XX(NEU_RESP_SCAN_TAGS, neu_resp_scan_tags_t)                       \
-    XX(NEU_REQ_CHECK_SCHEMA, neu_req_check_schema_t)                   \
-    XX(NEU_RESP_CHECK_SCHEMA, neu_resp_check_schema_t)                 \
-    XX(NEU_REQ_DRIVER_ACTION, neu_req_driver_action_t)                 \
-    XX(NEU_RESP_DRIVER_ACTION, neu_resp_driver_action_t)               \
-    XX(NEU_REQ_DRIVER_DIRECTORY, neu_req_driver_directory_t)           \
-    XX(NEU_RESP_DRIVER_DIRECTORY, neu_resp_driver_directory_t)         \
-    XX(NEU_REQ_FUP_OPEN, neu_req_fup_open_t)                           \
-    XX(NEU_RESP_FUP_OPEN, neu_resp_fup_open_t)                         \
-    XX(NEU_REQ_FUP_DATA, neu_req_fup_data_t)                           \
-    XX(NEU_RESP_FUP_DATA, neu_resp_fup_data_t)                         \
-    XX(NEU_REQ_FDOWN_OPEN, neu_req_fdown_open_t)                       \
-    XX(NEU_RESP_FDOWN_OPEN, neu_resp_fdown_open_t)                     \
-    XX(NEU_REQ_FDOWN_DATA, neu_req_fdown_data_t)                       \
-    XX(NEU_RESP_FDOWN_DATA, neu_resp_fdown_data_t)                     \
-    XX(NEU_REQ_ADD_NODE_EVENT, neu_req_add_node_t)                     \
-    XX(NEU_REQ_DEL_NODE_EVENT, neu_req_del_node_t)                     \
-    XX(NEU_REQ_NODE_CTL_EVENT, neu_req_node_ctl_t)                     \
-    XX(NEU_REQ_NODE_SETTING_EVENT, neu_req_node_setting_t)             \
-    XX(NEU_REQ_ADD_GROUP_EVENT, neu_req_add_group_t)                   \
-    XX(NEU_REQ_DEL_GROUP_EVENT, neu_req_del_group_t)                   \
-    XX(NEU_REQ_UPDATE_GROUP_EVENT, neu_req_update_group_t)             \
-    XX(NEU_REQ_ADD_TAG_EVENT, neu_req_add_tag_t)                       \
-    XX(NEU_REQ_DEL_TAG_EVENT, neu_req_del_tag_t)                       \
-    XX(NEU_REQ_UPDATE_TAG_EVENT, neu_req_update_tag_t)                 \
-    XX(NEU_REQ_ADD_GTAG_EVENT, neu_req_add_gtag_t)                     \
-    XX(NEU_REQ_ADD_PLUGIN_EVENT, neu_req_add_plugin_t)                 \
-    XX(NEU_REQ_DEL_PLUGIN_EVENT, neu_req_del_plugin_t)                 \
-    XX(NEU_REQ_SUBSCRIBE_GROUP_EVENT, neu_req_subscribe_t)             \
-    XX(NEU_REQ_UNSUBSCRIBE_GROUP_EVENT, neu_req_unsubscribe_t)         \
-    XX(NEU_REQ_UPDATE_SUBSCRIBE_GROUP_EVENT, neu_req_subscribe_t)      \
-    XX(NEU_REQ_SUBSCRIBE_GROUPS_EVENT, neu_req_subscribe_groups_t)     \
-    XX(NEU_RESP_WRITE_TAGS, neu_resp_write_tags_t)                     \
-    XX(NEU_REQ_GET_DATALAYERS_GROUPS, neu_req_get_subscribe_group_t)   \
-    XX(NEU_RESP_GET_DATALAYERS_GROUPS, neu_resp_get_subscribe_group_t) \
-    XX(NEU_REQ_GET_DATALAYERS_TAGS, neu_req_get_sub_driver_tags_t)     \
-    XX(NEU_RESP_GET_DATALAYERS_TAGS, neu_resp_get_sub_driver_tags_t)   \
-    XX(NEU_REQ_GET_DATALAYERS_TAG, neu_req_get_sub_driver_tags_t)      \
+#define NEU_REQRESP_TYPE_MAP(XX)                                            \
+    XX(NEU_RESP_ERROR, neu_resp_error_t)                                    \
+    XX(NEU_REQ_READ_GROUP, neu_req_read_group_t)                            \
+    XX(NEU_RESP_READ_GROUP, neu_resp_read_group_t)                          \
+    XX(NEU_REQ_READ_GROUP_PAGINATE, neu_req_read_group_paginate_t)          \
+    XX(NEU_RESP_READ_GROUP_PAGINATE, neu_resp_read_group_paginate_t)        \
+    XX(NEU_REQ_TEST_READ_TAG, neu_req_test_read_tag_t)                      \
+    XX(NEU_RESP_TEST_READ_TAG, neu_resp_test_read_tag_t)                    \
+    XX(NEU_REQ_WRITE_TAG, neu_req_write_tag_t)                              \
+    XX(NEU_REQ_WRITE_TAGS, neu_req_write_tags_t)                            \
+    XX(NEU_REQ_WRITE_GTAGS, neu_req_write_gtags_t)                          \
+    XX(NEU_REQ_SUBSCRIBE_GROUP, neu_req_subscribe_t)                        \
+    XX(NEU_REQ_UNSUBSCRIBE_GROUP, neu_req_unsubscribe_t)                    \
+    XX(NEU_REQ_UPDATE_SUBSCRIBE_GROUP, neu_req_subscribe_t)                 \
+    XX(NEU_REQ_SUBSCRIBE_GROUPS, neu_req_subscribe_groups_t)                \
+    XX(NEU_REQ_GET_SUBSCRIBE_GROUP, neu_req_get_subscribe_group_t)          \
+    XX(NEU_RESP_GET_SUBSCRIBE_GROUP, neu_resp_get_subscribe_group_t)        \
+    XX(NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP,                                  \
+       neu_req_get_driver_subscribe_group_t)                                \
+    XX(NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP, neu_resp_get_subscribe_group_t) \
+    XX(NEU_REQ_GET_SUB_DRIVER_TAGS, neu_req_get_sub_driver_tags_t)          \
+    XX(NEU_RESP_GET_SUB_DRIVER_TAGS, neu_resp_get_sub_driver_tags_t)        \
+    XX(NEU_REQ_NODE_INIT, neu_req_node_init_t)                              \
+    XX(NEU_REQ_NODE_UNINIT, neu_req_node_uninit_t)                          \
+    XX(NEU_RESP_NODE_UNINIT, neu_resp_node_uninit_t)                        \
+    XX(NEU_REQ_ADD_NODE, neu_req_add_node_t)                                \
+    XX(NEU_REQ_UPDATE_NODE, neu_req_update_node_t)                          \
+    XX(NEU_REQ_DEL_NODE, neu_req_del_node_t)                                \
+    XX(NEU_REQ_GET_NODE, neu_req_get_node_t)                                \
+    XX(NEU_RESP_GET_NODE, neu_resp_get_node_t)                              \
+    XX(NEU_REQ_NODE_SETTING, neu_req_node_setting_t)                        \
+    XX(NEU_REQ_GET_NODE_SETTING, neu_req_get_node_setting_t)                \
+    XX(NEU_RESP_GET_NODE_SETTING, neu_resp_get_node_setting_t)              \
+    XX(NEU_REQ_GET_NODE_STATE, neu_req_get_node_state_t)                    \
+    XX(NEU_RESP_GET_NODE_STATE, neu_resp_get_node_state_t)                  \
+    XX(NEU_REQ_GET_NODES_STATE, neu_req_get_nodes_state_t)                  \
+    XX(NEU_RESP_GET_NODES_STATE, neu_resp_get_nodes_state_t)                \
+    XX(NEU_REQ_NODE_CTL, neu_req_node_ctl_t)                                \
+    XX(NEU_REQ_NODE_RENAME, neu_req_node_rename_t)                          \
+    XX(NEU_RESP_NODE_RENAME, neu_resp_node_rename_t)                        \
+    XX(NEU_REQ_ADD_GROUP, neu_req_add_group_t)                              \
+    XX(NEU_REQ_DEL_GROUP, neu_req_del_group_t)                              \
+    XX(NEU_REQ_UPDATE_GROUP, neu_req_update_group_t)                        \
+    XX(NEU_REQ_UPDATE_DRIVER_GROUP, neu_req_update_group_t)                 \
+    XX(NEU_RESP_UPDATE_DRIVER_GROUP, neu_resp_update_group_t)               \
+    XX(NEU_REQ_GET_GROUP, neu_req_get_group_t)                              \
+    XX(NEU_RESP_GET_GROUP, neu_resp_get_group_t)                            \
+    XX(NEU_REQ_GET_DRIVER_GROUP, neu_req_get_group_t)                       \
+    XX(NEU_RESP_GET_DRIVER_GROUP, neu_resp_get_driver_group_t)              \
+    XX(NEU_REQ_ADD_TAG, neu_req_add_tag_t)                                  \
+    XX(NEU_RESP_ADD_TAG, neu_resp_add_tag_t)                                \
+    XX(NEU_REQ_ADD_GTAG, neu_req_add_gtag_t)                                \
+    XX(NEU_RESP_ADD_GTAG, neu_resp_add_tag_t)                               \
+    XX(NEU_REQ_DEL_TAG, neu_req_del_tag_t)                                  \
+    XX(NEU_REQ_UPDATE_TAG, neu_req_update_tag_t)                            \
+    XX(NEU_RESP_UPDATE_TAG, neu_resp_update_tag_t)                          \
+    XX(NEU_REQ_GET_TAG, neu_req_get_tag_t)                                  \
+    XX(NEU_RESP_GET_TAG, neu_resp_get_tag_t)                                \
+    XX(NEU_REQ_ADD_PLUGIN, neu_req_add_plugin_t)                            \
+    XX(NEU_REQ_DEL_PLUGIN, neu_req_del_plugin_t)                            \
+    XX(NEU_REQ_UPDATE_PLUGIN, neu_req_update_plugin_t)                      \
+    XX(NEU_REQ_GET_PLUGIN, neu_req_get_plugin_t)                            \
+    XX(NEU_RESP_GET_PLUGIN, neu_resp_get_plugin_t)                          \
+    XX(NEU_REQRESP_TRANS_DATA, neu_reqresp_trans_data_t)                    \
+    XX(NEU_REQRESP_NODES_STATE, neu_reqresp_nodes_state_t)                  \
+    XX(NEU_REQRESP_NODE_DELETED, neu_reqresp_node_deleted_t)                \
+    XX(NEU_REQ_ADD_DRIVERS, neu_req_driver_array_t)                         \
+    XX(NEU_REQ_UPDATE_LOG_LEVEL, neu_req_update_log_level_t)                \
+    XX(NEU_REQ_PRGFILE_UPLOAD, neu_req_prgfile_upload_t)                    \
+    XX(NEU_REQ_PRGFILE_PROCESS, neu_req_prgfile_process_t)                  \
+    XX(NEU_RESP_PRGFILE_PROCESS, neu_resp_prgfile_process_t)                \
+    XX(NEU_REQ_SCAN_TAGS, neu_req_scan_tags_t)                              \
+    XX(NEU_RESP_SCAN_TAGS, neu_resp_scan_tags_t)                            \
+    XX(NEU_REQ_CHECK_SCHEMA, neu_req_check_schema_t)                        \
+    XX(NEU_RESP_CHECK_SCHEMA, neu_resp_check_schema_t)                      \
+    XX(NEU_REQ_DRIVER_ACTION, neu_req_driver_action_t)                      \
+    XX(NEU_RESP_DRIVER_ACTION, neu_resp_driver_action_t)                    \
+    XX(NEU_REQ_DRIVER_DIRECTORY, neu_req_driver_directory_t)                \
+    XX(NEU_RESP_DRIVER_DIRECTORY, neu_resp_driver_directory_t)              \
+    XX(NEU_REQ_FUP_OPEN, neu_req_fup_open_t)                                \
+    XX(NEU_RESP_FUP_OPEN, neu_resp_fup_open_t)                              \
+    XX(NEU_REQ_FUP_DATA, neu_req_fup_data_t)                                \
+    XX(NEU_RESP_FUP_DATA, neu_resp_fup_data_t)                              \
+    XX(NEU_REQ_FDOWN_OPEN, neu_req_fdown_open_t)                            \
+    XX(NEU_RESP_FDOWN_OPEN, neu_resp_fdown_open_t)                          \
+    XX(NEU_REQ_FDOWN_DATA, neu_req_fdown_data_t)                            \
+    XX(NEU_RESP_FDOWN_DATA, neu_resp_fdown_data_t)                          \
+    XX(NEU_REQ_ADD_NODE_EVENT, neu_req_add_node_t)                          \
+    XX(NEU_REQ_DEL_NODE_EVENT, neu_req_del_node_t)                          \
+    XX(NEU_REQ_NODE_CTL_EVENT, neu_req_node_ctl_t)                          \
+    XX(NEU_REQ_NODE_SETTING_EVENT, neu_req_node_setting_t)                  \
+    XX(NEU_REQ_ADD_GROUP_EVENT, neu_req_add_group_t)                        \
+    XX(NEU_REQ_DEL_GROUP_EVENT, neu_req_del_group_t)                        \
+    XX(NEU_REQ_UPDATE_GROUP_EVENT, neu_req_update_group_t)                  \
+    XX(NEU_REQ_ADD_TAG_EVENT, neu_req_add_tag_t)                            \
+    XX(NEU_REQ_DEL_TAG_EVENT, neu_req_del_tag_t)                            \
+    XX(NEU_REQ_UPDATE_TAG_EVENT, neu_req_update_tag_t)                      \
+    XX(NEU_REQ_ADD_GTAG_EVENT, neu_req_add_gtag_t)                          \
+    XX(NEU_REQ_ADD_PLUGIN_EVENT, neu_req_add_plugin_t)                      \
+    XX(NEU_REQ_DEL_PLUGIN_EVENT, neu_req_del_plugin_t)                      \
+    XX(NEU_REQ_SUBSCRIBE_GROUP_EVENT, neu_req_subscribe_t)                  \
+    XX(NEU_REQ_UNSUBSCRIBE_GROUP_EVENT, neu_req_unsubscribe_t)              \
+    XX(NEU_REQ_UPDATE_SUBSCRIBE_GROUP_EVENT, neu_req_subscribe_t)           \
+    XX(NEU_REQ_SUBSCRIBE_GROUPS_EVENT, neu_req_subscribe_groups_t)          \
+    XX(NEU_RESP_WRITE_TAGS, neu_resp_write_tags_t)                          \
+    XX(NEU_REQ_GET_DATALAYERS_GROUPS, neu_req_get_subscribe_group_t)        \
+    XX(NEU_RESP_GET_DATALAYERS_GROUPS, neu_resp_get_subscribe_group_t)      \
+    XX(NEU_REQ_GET_DATALAYERS_TAGS, neu_req_get_sub_driver_tags_t)          \
+    XX(NEU_RESP_GET_DATALAYERS_TAGS, neu_resp_get_sub_driver_tags_t)        \
+    XX(NEU_REQ_GET_DATALAYERS_TAG, neu_req_get_sub_driver_tags_t)           \
     XX(NEU_RESP_GET_DATALAYERS_TAG, neu_resp_get_sub_driver_tags_t)
 
 static inline size_t neu_reqresp_size(neu_reqresp_type_e t)

src/base/tag.c

@@ -262,21 +262,35 @@ int neu_datatag_parse_addr_option(const neu_datatag_t *      datatag,
     case NEU_TYPE_UINT64: {
         char *op = find_last_character(datatag->address, '#');
 
-        option->value64.endian = NEU_DATATAG_ENDIAN_L64;
+        option->value64.endian     = NEU_DATATAG_ENDIAN_L64;
+        option->value64.is_default = true;
         if (op != NULL) {
-            char e = 0;
-            sscanf(op, "#%c", &e);
+            char e1 = 0;
+            char e2 = 0;
+            int  n  = sscanf(op, "#%c%c", &e1, &e2);
 
-            switch (e) {
-            case 'B':
-                option->value64.endian = NEU_DATATAG_ENDIAN_B64;
-                break;
-            case 'L':
-                option->value64.endian = NEU_DATATAG_ENDIAN_L64;
-                break;
-            default:
-                option->value64.endian = NEU_DATATAG_ENDIAN_L64;
-                break;
+            if (n == 2) {
+                if (e1 == 'B' && e2 == 'B') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_BB64;
+                    option->value64.is_default = false;
+                } else if (e1 == 'B' && e2 == 'L') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_BL64;
+                    option->value64.is_default = false;
+                } else if (e1 == 'L' && e2 == 'L') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_LL64;
+                    option->value64.is_default = false;
+                } else if (e1 == 'L' && e2 == 'B') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_LB64;
+                    option->value64.is_default = false;
+                }
+            } else if (n == 1) {
+                if (e1 == 'B') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_B64;
+                    option->value64.is_default = false;
+                } else if (e1 == 'L') {
+                    option->value64.endian     = NEU_DATATAG_ENDIAN_L64;
+                    option->value64.is_default = false;
+                }
             }
         }
 

src/connection/connection.c

@@ -503,7 +503,7 @@ ssize_t neu_conn_recv(neu_conn_t *conn, uint8_t *buf, ssize_t len)
                 conn->param.log,
                 "tcp conn fd: %d, recv buf len %zd, ret: %zd, errno: %s(%d)",
                 conn->fd, len, ret, strerror(errno), errno);
-            if (ret == 0 || (ret == -1 && errno != EAGAIN)) {
+            if (ret == 0 || (conn->connection_ok && ret == -1 && errno != EAGAIN)) {
                 conn_disconnect(conn);
             }
         }

src/connection/connection_eth.c

@@ -137,7 +137,7 @@ neu_conn_eth_t *neu_conn_eth_init(const char *interface, void *ctx)
                 conn_eth->ic = &in_conns[i];
 
                 in_conns[i].interface = strdup(interface);
-                in_conns[i].events    = neu_event_new();
+                in_conns[i].events    = neu_event_new("eth_conn");
                 in_conns[i].count += 1;
 
                 get_mac(conn_eth, interface);

src/connection/mqtt_client.c

@@ -907,7 +907,7 @@ static inline int client_start_timer(neu_mqtt_client_t *client)
         return 0;
     }
 
-    events = neu_event_new();
+    events = neu_event_new("mqtt_client");
     if (NULL == events) {
         return -1;
     }

src/core/manager.c

@@ -98,7 +98,7 @@ neu_manager_t *neu_manager_create()
         .type        = NEU_EVENT_TIMER_NOBLOCK,
     };
 
-    manager->events            = neu_event_new();
+    manager->events            = neu_event_new("manager");
     manager->plugin_manager    = neu_plugin_manager_create();
     manager->node_manager      = neu_node_manager_create();
     manager->subscribe_manager = neu_subscribe_manager_create();
@@ -1010,6 +1010,18 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
         reply(manager, header, &resp);
         break;
     }
+    case NEU_REQ_GET_DRIVER_SUBSCRIBE_GROUP: {
+        neu_req_get_driver_subscribe_group_t *cmd =
+            (neu_req_get_driver_subscribe_group_t *) &header[1];
+        UT_array *groups =
+            neu_manager_get_driver_groups(manager, cmd->app, cmd->name);
+        neu_resp_get_subscribe_group_t resp = { .groups = groups };
+
+        strcpy(header->receiver, header->sender);
+        header->type = NEU_RESP_GET_DRIVER_SUBSCRIBE_GROUP;
+        reply(manager, header, &resp);
+        break;
+    }
     case NEU_REQ_GET_SUB_DRIVER_TAGS: {
         neu_req_get_sub_driver_tags_t *cmd =
             (neu_req_get_sub_driver_tags_t *) &header[1];

src/core/manager_internal.c

@@ -380,6 +380,55 @@ UT_array *neu_manager_get_sub_group_deep_copy(neu_manager_t *manager,
     return subs;
 }
 
+UT_array *neu_manager_get_driver_groups(neu_manager_t *manager, const char *app,
+                                        const char *name)
+{
+    UT_icd icd = { sizeof(neu_resp_driver_subscribe_info_t), NULL, NULL, NULL };
+    UT_array *result = NULL;
+
+    UT_array *sub_groups =
+        neu_subscribe_manager_get(manager->subscribe_manager, app, NULL, NULL);
+    UT_array *driver_groups = neu_manager_get_driver_group(manager);
+
+    utarray_new(result, &icd);
+    utarray_foreach(driver_groups, neu_resp_driver_group_info_t *, grp)
+    {
+        neu_resp_driver_subscribe_info_t info = { 0 };
+
+        if (name != NULL && strlen(name) > 0) {
+            if (strstr(grp->driver, name) != NULL ||
+                strstr(grp->group, name) != NULL) {
+                strcpy(info.app, app);
+                strcpy(info.driver, grp->driver);
+                strcpy(info.group, grp->group);
+                info.subscribed = false;
+            }
+        } else {
+            strcpy(info.app, app);
+            strcpy(info.driver, grp->driver);
+            strcpy(info.group, grp->group);
+            info.subscribed = false;
+        }
+
+        if (strlen(info.driver) > 0 && strlen(info.group) > 0) {
+            utarray_foreach(sub_groups, neu_resp_subscribe_info_t *, sub)
+            {
+                if (strcmp(sub->driver, info.driver) == 0 &&
+                    strcmp(sub->group, info.group) == 0) {
+                    info.subscribed = true;
+                    break;
+                }
+            }
+
+            utarray_push_back(result, &info);
+        }
+    }
+
+    utarray_free(sub_groups);
+    utarray_free(driver_groups);
+    return result;
+}
+
 int neu_manager_get_node_info(neu_manager_t *manager, const char *name,
                               neu_persist_node_info_t *info)
 {

src/core/manager_internal.h

@@ -85,6 +85,8 @@ UT_array *neu_manager_get_sub_group_deep_copy(neu_manager_t *manager,
                                               const char *   app,
                                               const char *   driver,
                                               const char *   group);
+UT_array *neu_manager_get_driver_groups(neu_manager_t *manager, const char *app,
+                                        const char *name);
 
 int neu_manager_get_node_info(neu_manager_t *manager, const char *name,
                               neu_persist_node_info_t *info);

src/event/event_linux.c

@@ -72,6 +72,7 @@ struct neu_events {
     int       epoll_fd;
     pthread_t thread;
     bool      stop;
+    char *    name;
 
     pthread_mutex_t   mtx;
     int               n_event;
@@ -122,8 +123,8 @@ static void *event_loop(void *arg)
         }
 
         if (ret == -1 || events->stop) {
-            zlog_warn(neuron, "event loop exit, errno: %s(%d), stop: %d",
-                      strerror(errno), errno, events->stop);
+            zlog_warn(neuron, "event loop(%s) exit, errno: %s(%d), stop: %d",
+                      events->name, strerror(errno), errno, events->stop);
             break;
         }
 
@@ -177,17 +178,18 @@ static void *event_loop(void *arg)
     return NULL;
 };
 
-neu_events_t *neu_event_new(void)
+neu_events_t *neu_event_new(const char *name)
 {
     neu_events_t *events = calloc(1, sizeof(struct neu_events));
 
     events->epoll_fd = epoll_create(1);
 
-    nlog_notice("create epoll: %d(%d)", events->epoll_fd, errno);
+    nlog_notice("create epoll(%s): %d(%d)", name, events->epoll_fd, errno);
     assert(events->epoll_fd > 0);
 
     events->stop    = false;
     events->n_event = 0;
+    events->name    = strdup(name);
     pthread_mutex_init(&events->mtx, NULL);
 
     pthread_create(&events->thread, NULL, event_loop, events);
@@ -199,6 +201,7 @@ int neu_event_close(neu_events_t *events)
 {
     events->stop = true;
     close(events->epoll_fd);
+    free(events->name);
 
     pthread_join(events->thread, NULL);
     pthread_mutex_destroy(&events->mtx);
@@ -220,7 +223,8 @@ neu_event_timer_t *neu_event_add_timer(neu_events_t *          events,
     };
     int index = get_free_event(events);
     if (index < 0) {
-        zlog_fatal(neuron, "no free event: %d", events->epoll_fd);
+        zlog_fatal(neuron, "no free event(%s): %d", events->name,
+                   events->epoll_fd);
     }
     assert(index >= 0);
 
@@ -251,18 +255,19 @@ neu_event_timer_t *neu_event_add_timer(neu_events_t *          events,
 
     zlog_notice(neuron,
                 "add timer, second: %" PRId64 ", millisecond: %" PRId64
-                ", timer: %d in epoll %d, "
+                ", timer: %d in epoll(%s) %d, "
                 "ret: %d, index: %d",
-                timer.second, timer.millisecond, timer_fd, events->epoll_fd,
-                ret, index);
+                timer.second, timer.millisecond, timer_fd, events->name,
+                events->epoll_fd, ret, index);
 
     return timer_ctx;
 }
 
 int neu_event_del_timer(neu_events_t *events, neu_event_timer_t *timer)
 {
-    zlog_notice(neuron, "del timer: %d from epoll: %d, index: %d", timer->fd,
-                events->epoll_fd, timer->event_data->index);
+    zlog_notice(neuron, "del timer: %d from epoll(%s): %d, index: %d",
+                timer->fd, events->name, events->epoll_fd,
+                timer->event_data->index);
 
     timer->stop = true;
     epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, timer->fd, NULL);
@@ -281,8 +286,8 @@ neu_event_io_t *neu_event_add_io(neu_events_t *events, neu_event_io_param_t io)
     int ret   = 0;
     int index = get_free_event(events);
 
-    nlog_notice("add io, fd: %d, epoll: %d, index: %d", io.fd, events->epoll_fd,
-                index);
+    nlog_notice("add io, fd: %d, epoll(%s): %d, index: %d", io.fd, events->name,
+                events->epoll_fd, index);
     assert(index >= 0);
 
     neu_event_io_t *io_ctx   = &events->event_datas[index].ctx.io;
@@ -303,8 +308,8 @@ neu_event_io_t *neu_event_add_io(neu_events_t *events, neu_event_io_param_t io)
 
     ret = epoll_ctl(events->epoll_fd, EPOLL_CTL_ADD, io.fd, &event);
 
-    nlog_notice("add io, fd: %d, epoll: %d, ret: %d(%d), index: %d", io.fd,
-                events->epoll_fd, ret, errno, index);
+    nlog_notice("add io, fd: %d, epoll(%s): %d, ret: %d(%d), index: %d", io.fd,
+                events->name, events->epoll_fd, ret, errno, index);
     assert(ret == 0);
 
     return io_ctx;
@@ -316,8 +321,8 @@ int neu_event_del_io(neu_events_t *events, neu_event_io_t *io)
         return 0;
     }
 
-    zlog_notice(neuron, "del io: %d from epoll: %d, index: %d", io->fd,
-                events->epoll_fd, io->event_data->index);
+    zlog_notice(neuron, "del io: %d from epoll(%s): %d, index: %d", io->fd,
+                events->name, events->epoll_fd, io->event_data->index);
 
     epoll_ctl(events->epoll_fd, EPOLL_CTL_DEL, io->fd, NULL);
     free_event(events, io->event_data->index);

src/otel/otel_manager.c

@@ -1113,7 +1113,7 @@ static int otel_timer_cb(void *data)
 void neu_otel_start()
 {
     if (otel_event == NULL) {
-        otel_event = neu_event_new();
+        otel_event = neu_event_new("otel_event");
     }
 
     if (otel_timer == NULL) {

src/parser/neu_json_group_config.c

@@ -405,6 +405,50 @@ int neu_json_encode_get_subscribe_resp(void *object, void *param)
     return ret;
 }
 
+int neu_json_encode_get_driver_subscribe_resp(void *object, void *param)
+{
+
+    neu_json_get_driver_subscribe_resp_t *resp =
+        (neu_json_get_driver_subscribe_resp_t *) param;
+
+    void *driver_array = neu_json_array();
+    for (int i = 0; i < resp->n_driver; i++) {
+        if (resp->drivers[i].n_group == 0) {
+            continue;
+        }
+
+        json_t *ob          = json_object();
+        void *  group_array = neu_json_array();
+
+        json_object_set_new(ob, "name", json_string(resp->drivers[i].driver));
+
+        for (int j = 0; j < resp->drivers[i].n_group; j++) {
+            json_t *group_ob = json_object();
+
+            json_object_set_new(group_ob, "name",
+                                json_string(resp->drivers[i].groups[j].group));
+            json_object_set_new(
+                group_ob, "subscribed",
+                json_boolean(resp->drivers[i].groups[j].subscribed));
+
+            json_array_append_new(group_array, group_ob);
+        }
+
+        json_object_set_new(ob, "groups", group_array);
+
+        json_array_append_new(driver_array, ob);
+    }
+
+    neu_json_elem_t resp_elems[] = { {
+        .name         = "drivers",
+        .t            = NEU_JSON_OBJECT,
+        .v.val_object = driver_array,
+    } };
+
+    return neu_json_encode_field(object, resp_elems,
+                                 NEU_JSON_ELEM_SIZE(resp_elems));
+}
+
 static inline int dump_params(void *root, char **const result)
 {
     return neu_json_dump_key(root, "params", result, false);

src/parser/neu_json_group_config.h

@@ -113,6 +113,24 @@ typedef struct {
 
 int neu_json_encode_get_subscribe_resp(void *json_object, void *param);
 
+typedef struct {
+    char *group;
+    bool  subscribed;
+} neu_json_get_driver_subscribe_resp_group_t;
+
+typedef struct {
+    char *                                      driver;
+    int                                         n_group;
+    neu_json_get_driver_subscribe_resp_group_t *groups;
+} neu_json_get_driver_subscribe_resp_driver_t;
+
+typedef struct {
+    int                                          n_driver;
+    neu_json_get_driver_subscribe_resp_driver_t *drivers;
+} neu_json_get_driver_subscribe_resp_t;
+
+int neu_json_encode_get_driver_subscribe_resp(void *json_object, void *param);
+
 typedef struct {
     char *group;
     char *app;

src/utils/json.c

@@ -534,6 +534,10 @@ static int decode_object(json_t *root, neu_json_elem_t *ele)
                     ele->t = NEU_JSON_ARRAY_BOOL;
                     break;
                 }
+                if (json_is_object(value)) {
+                    ele->t = NEU_JSON_OBJECT;
+                    break;
+                }
             }
         } else if (json_is_object(ob)) {
             ele->t = NEU_JSON_OBJECT;

tests/ft/app/test_mqtt.py

@@ -62,12 +62,12 @@ TAGS = [
 ]
 FORMAT_VALUES = 0
 FORMAT_TAGS = 1
-UPLOAD_TOPIC = f"/neuron/{NODE}/upload"
-WRITE_REQ_TOPIC = f"/neuron/{NODE}/write/req"
-WRITE_RESP_TOPIC = f"/neuron/{NODE}/write/resp"
-READ_REQ_TOPIC = f"/neuron/{NODE}/read/req"
-READ_RESP_TOPIC = f"/neuron/{NODE}/read/resp"
-UPLOAD_DRV_STATE_TOPIC = f"/neuron/{NODE}/state/update"
+UPLOAD_TOPIC = f"neuron/{NODE}/upload"
+WRITE_REQ_TOPIC = f"neuron/{NODE}/write/req"
+WRITE_RESP_TOPIC = f"neuron/{NODE}/write/resp"
+READ_REQ_TOPIC = f"neuron/{NODE}/read/req"
+READ_RESP_TOPIC = f"neuron/{NODE}/read/resp"
+UPLOAD_DRV_STATE_TOPIC = f"neuron/{NODE}/state/update"
 
 
 @pytest.fixture(autouse=True, scope="class")
@@ -204,7 +204,7 @@ def conf_upload_driver_state(conf_base):
     return {
         **conf_base,
         "upload_drv_state": True,
-        "upload_drv_state_topic": f"/neuron/{NODE}/state/update",
+        "upload_drv_state_topic": f"neuron/{NODE}/state/update",
         "upload_drv_state_interval": 1,
     }
 

version

@@ -1 +1 @@
-2.12.0
+2.12.2