【完善】日志格式，使用 rtdbg

src/onenet_http.c

@@ -55,7 +55,7 @@
     {                                                                                                   \
         if (webclient_header_fields_add(session, fmt, ##__VA_ARGS__) < 0)                               \
         {                                                                                               \
-            log_e("webclient add header failed!");                                                      \
+            LOG_E("webclient add header failed!");                                                      \
             goto __exit;                                                                                \
         }                                                                                               \
     } while(0);                                                                                         \
@@ -69,7 +69,7 @@ static rt_err_t onenet_upload_data(char *send_buffer)
     char *URI = RT_NULL;
     rt_err_t result = RT_EOK;
 
-    assert(send_buffer);
+    RT_ASSERT(send_buffer);
 
     URI = ONENET_CALLOC(1, ONENET_CON_URI_LEN);
     if (URI == RT_NULL)
@@ -119,9 +119,9 @@ static rt_err_t onenet_get_string_data(const char *ds_name, const char *str, cha
     rt_err_t result = RT_EOK;
     cJSON *root = RT_NULL;
 
-    assert(ds_name);
-    assert(str);
-    assert(out_buff);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(str);
+    RT_ASSERT(out_buff);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -155,8 +155,8 @@ static rt_err_t onenet_get_digit_data(const char *ds_name, const double digit, c
     rt_err_t result = RT_EOK;
     cJSON *root = RT_NULL;
 
-    assert(ds_name);
-    assert(out_buff);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(out_buff);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -199,7 +199,7 @@ rt_err_t onenet_http_upload_digit(const char *ds_name, const double digit)
     char *send_buffer = RT_NULL;
     rt_err_t result = RT_EOK;
 
-    assert(ds_name);
+    RT_ASSERT(ds_name);
 
     /* get JSON format data */
     result = onenet_get_digit_data(ds_name, digit, &send_buffer);
@@ -238,8 +238,8 @@ rt_err_t onenet_http_upload_string(const char *ds_name, const char *str)
     char *send_buffer = RT_NULL;
     rt_err_t result = RT_EOK;
 
-    assert(ds_name);
-    assert(str);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(str);
 
     /* get JSON format data */
     result = onenet_get_string_data(ds_name, str, &send_buffer);
@@ -272,7 +272,7 @@ static rt_err_t response_register_handlers(const unsigned char *rec_buf, const s
     cJSON *itemid = RT_NULL;
     cJSON *itemapikey = RT_NULL;
 
-    assert(rec_buf);
+    RT_ASSERT(rec_buf);
 
     LOG_D("response is %.*s", length, rec_buf);
 
@@ -311,7 +311,7 @@ static rt_err_t onenet_upload_register_device(char *send_buffer)
     unsigned char *rec_buf;
     rt_err_t result = RT_EOK;
 
-    assert(send_buffer);
+    RT_ASSERT(send_buffer);
 
     session = webclient_session_create(ONENET_HTTP_HEAD_LEN);
     if (session == RT_NULL)
@@ -382,9 +382,9 @@ static rt_err_t onenet_get_register_device_data(const char *ds_name, const char
     cJSON *root = RT_NULL;
     char *msg_str = RT_NULL;
 
-    assert(ds_name);
-    assert(auth_info);
-    assert(out_buff);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(auth_info);
+    RT_ASSERT(out_buff);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -434,8 +434,8 @@ rt_err_t onenet_http_register_device(const char *name, const char *auth_info)
     char *send_buffer = RT_NULL;
     rt_err_t result = RT_EOK;
 
-    assert(name);
-    assert(auth_info);
+    RT_ASSERT(name);
+    RT_ASSERT(auth_info);
 
     send_buffer = (char *) ONENET_CALLOC(1, ONENET_SEND_DATA_LEN);
     if (!send_buffer)
@@ -475,7 +475,7 @@ static cJSON *response_get_datapoints_handlers(const uint8_t *rec_buf)
     cJSON *itemdata = RT_NULL ;
     cJSON *item = RT_NULL;
 
-    assert(rec_buf);
+    RT_ASSERT(rec_buf);
 
     root = cJSON_Parse((char *) rec_buf);
     if (!root)
@@ -513,7 +513,7 @@ static cJSON *onenet_http_get_datapoints(char *datastream, char *start, char *en
     cJSON *itemdata = RT_NULL;
     size_t res_len = 0;
 
-    assert(datastream);
+    RT_ASSERT(datastream);
 
     URI = (char *) ONENET_CALLOC(1, ONENET_CON_URI_LEN);
     if (URI == RT_NULL)
@@ -614,7 +614,7 @@ __exit:
  */
 cJSON *onenet_get_dp_by_limit(char *ds_name, size_t limit)
 {
-    assert(ds_name);
+    RT_ASSERT(ds_name);
 
     return onenet_http_get_datapoints(ds_name, RT_NULL, RT_NULL, RT_NULL, limit);
 }
@@ -636,7 +636,7 @@ cJSON *onenet_get_dp_by_start_end(char *ds_name, uint32_t start, uint32_t end, s
     char start_buf[ONENET_TIME_BUF_LEN] = { 0 }, end_buf[ONENET_TIME_BUF_LEN] = { 0 };
     struct tm *cur_tm;
 
-    assert(ds_name);
+    RT_ASSERT(ds_name);
 
     time_t time = (time_t)(start + 8 * 60 * 60);
 
@@ -673,7 +673,7 @@ cJSON *onenet_get_dp_by_start_duration(char *ds_name, uint32_t start, size_t dur
     struct tm *cur_tm;
     char start_buf[ONENET_TIME_BUF_LEN] = { 0 };
 
-    assert(ds_name);
+    RT_ASSERT(ds_name);
 
     time_t time = (time_t)(start + 8 * 60 * 60);
 
@@ -694,8 +694,8 @@ static rt_err_t response_get_datastreams_handlers(const unsigned char *rec_buf,
     cJSON *itemarray = RT_NULL;
     rt_err_t result = RT_EOK;
 
-    assert(rec_buf);
-    assert(datastream);
+    RT_ASSERT(rec_buf);
+    RT_ASSERT(datastream);
 
     root = cJSON_Parse((char *) rec_buf);
     if (!root)
@@ -778,8 +778,8 @@ rt_err_t onenet_http_get_datastream(const char *ds_name, struct rt_onenet_ds_inf
     rt_err_t result = RT_EOK;
     size_t res_len = 0;
 
-    assert(ds_name);
-    assert(datastream);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(datastream);
 
     URI = (char *) ONENET_CALLOC(1, ONENET_CON_URI_LEN);
     if (URI == NULL)

src/onenet_mqtt.c

@@ -66,8 +66,8 @@ static void mqtt_callback(MQTTClient *c, MessageData *msg_data)
     uint8_t *response_buf = RT_NULL;
     char topicname[45] = { "$crsp/" };
 
-    assert(c);
-    assert(msg_data);
+    RT_ASSERT(c);
+    RT_ASSERT(msg_data);
 
     LOG_D("topic %.*s receive a message", msg_data->topicName->lenstring.len, msg_data->topicName->lenstring.data);
 
@@ -251,8 +251,8 @@ rt_err_t onenet_mqtt_publish(const char *topic, const uint8_t *msg, size_t len)
 {
     MQTTMessage message;
 
-    assert(topic);
-    assert(msg);
+    RT_ASSERT(topic);
+    RT_ASSERT(msg);
 
     message.qos = QOS1;
     message.retained = 0;
@@ -273,9 +273,9 @@ static rt_err_t onenet_mqtt_get_digit_data(const char *ds_name, const double dig
     cJSON *root = RT_NULL;
     char *msg_str = RT_NULL;
 
-    assert(ds_name);
-    assert(out_buff);
-    assert(length);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(out_buff);
+    RT_ASSERT(length);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -339,7 +339,7 @@ rt_err_t onenet_mqtt_upload_digit(const char *ds_name, const double digit)
     rt_err_t result = RT_EOK;
     size_t length = 0;
 
-    assert(ds_name);
+    RT_ASSERT(ds_name);
 
     result = onenet_mqtt_get_digit_data(ds_name, digit, &send_buffer, &length);
     if (result < 0)
@@ -369,10 +369,10 @@ static rt_err_t onenet_mqtt_get_string_data(const char *ds_name, const char *str
     cJSON *root = RT_NULL;
     char *msg_str = RT_NULL;
 
-    assert(ds_name);
-    assert(str);
-    assert(out_buff);
-    assert(length);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(str);
+    RT_ASSERT(out_buff);
+    RT_ASSERT(length);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -436,8 +436,8 @@ rt_err_t onenet_mqtt_upload_string(const char *ds_name, const char *str)
     rt_err_t result = RT_EOK;
     size_t length = 0;
 
-    assert(ds_name);
-    assert(str);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(str);
 
     result = onenet_mqtt_get_string_data(ds_name, str, &send_buffer, &length);
     if (result < 0)
@@ -482,10 +482,10 @@ static rt_err_t onenet_mqtt_get_bin_data(const char *str, const uint8_t *bin, in
     cJSON *root = RT_NULL;
     char *msg_str = RT_NULL;
 
-    assert(str);
-    assert(bin);
-    assert(out_buff);
-    assert(length);
+    RT_ASSERT(str);
+    RT_ASSERT(bin);
+    RT_ASSERT(out_buff);
+    RT_ASSERT(length);
 
     root = cJSON_CreateObject();
     if (!root)
@@ -555,8 +555,8 @@ rt_err_t onenet_mqtt_upload_bin(const char *ds_name, uint8_t *bin, size_t len)
     rt_err_t result = RT_EOK;
     uint8_t *send_buffer = RT_NULL;
 
-    assert(ds_name);
-    assert(bin);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(bin);
 
     result = onenet_mqtt_get_bin_data(ds_name, bin, len, &send_buffer, &length);
     if (result < 0)
@@ -602,8 +602,8 @@ rt_err_t onenet_mqtt_upload_bin_by_path(const char *ds_name, const char *bin_pat
     uint8_t *send_buffer = RT_NULL;
     uint8_t * bin_array = RT_NULL;
 
-    assert(ds_name);
-    assert(bin_path);
+    RT_ASSERT(ds_name);
+    RT_ASSERT(bin_path);
 
     if (stat(bin_path, &file_stat) < 0)
     {