Merge pull request #328 from cruise2018/iot_link

fix:lwm2m:fix the oberve mutex created and delete

Author: cruise2018

iot_link/link_misc/link_misc.h

@@ -71,6 +71,26 @@ char *osal_strdup(const char *ch);
 
 
 
+/**
+ *
+ *                       dataoff
+ * ring buffer map:       |  ----datalen-------
+ *                        | /                   \
+ *                        |/                     \
+ *   ----------------------------------------------------------
+ *   |     empty space    |//////valid data///////|           |
+ *   ----------------------------------------------------------
+ *   | \                                                      /
+ *   |  \                                                    /
+ *   |   \                                                  /
+ *   |     ---------------buflen--------------------------
+ *  buf
+ *
+ *  attention that do dump read or write means no data will really write or read,
+ *  it only changed the dataoff or datalen, and you make sure that the dump read
+ *  or write length  is legal
+ *
+ * */
 
 /**
  * @brief: this is the ring buffer data structure, implement as the common function
@@ -84,6 +104,7 @@ typedef struct
     int              dataoff;  ///< which means the valid data offset in the buffer
 }tag_ring_buffer_t;
 
+typedef tag_ring_buffer_t  ring_buffer_t;
 
 /**
  * @brief:use this function to make a new ring handle
@@ -136,6 +157,16 @@ int ring_buffer_write(tag_ring_buffer_t *ring,unsigned char *buf, int len);
 
 int ring_buffer_read(tag_ring_buffer_t *ring,unsigned char *buf, int len);
 
+#define ring_buffer_buf(x)          (x->buf)
+#define ring_buffer_buflen(x)       (x->buflen)
+#define ring_buffer_data(x)         (x->buf + x->dataoff)
+//#define ring_buffer_datalen(x)      (x->datalen)
+//#define ring_buffer_freespace(x)    (x->buflen - x->datalen)
+
+#define ring_buffer_dataoff(x)      (x->dataoff)
+#define ring_buffer_dumpread(x,y)   do{x->dataoff = (x->dataoff + y)%x->buflen; x->datalen -= y;}while(0)
+#define ring_buffer_dumpwrite(x,y)  do{x->datalen += y;)while(0)
+
 /**
  * @brief:use this function check out how many data in the ring buffer
  *

iot_link/network/lwm2m/wakaama_lwm2m/port/lwm2m_port.c

@@ -466,6 +466,11 @@ int lwm2m_destroy(void *handle)
 
     if (NULL != handle_data->lwm2m_context)
     {
+
+#ifdef LWM2M_CLIENT_MODE
+        osal_mutex_del(handle_data->lwm2m_context->observe_mutex);
+#endif
+
         lwm2m_close(handle_data->lwm2m_context);
     }
 
@@ -668,6 +673,20 @@ static int __config(void **handle, lwm2m_al_init_param_t *init_param)
         osal_semp_del(hd->quit_sem);
         return LWM2M_MALLOC_FAILED;
     }
+#ifdef LWM2M_CLIENT_MODE
+
+    if(false == osal_mutex_create(&lwm2m_context->observe_mutex))
+    {
+        ATINY_LOG(LOG_FATAL, "memory not enough");
+        lwm2m_free(lwm2m_context->endpointName);
+        lwm2m_free(lwm2m_context);
+        osal_mutex_del(g_data_mutex);
+        osal_semp_del(hd->quit_sem);
+        osal_free(hd->recv_buffer);
+        return LWM2M_MALLOC_FAILED;
+    }
+#endif
+
 
 #ifdef CONFIG_FEATURE_FOTA
     result = lwm2m_fota_manager_set_storage_device(lwm2m_fota_manager_get_instance());
@@ -684,6 +703,9 @@ static int __config(void **handle, lwm2m_al_init_param_t *init_param)
 
     (void)lwm2m_fota_manager_set_lwm2m_context(lwm2m_fota_manager_get_instance(), lwm2m_context);
 #endif
+
+
+
     hd->client_data.lwm2mH = lwm2m_context;
     hd->lwm2m_context = lwm2m_context;
     *handle = hd;

iot_link/os/novaos/novaos_imp.c

@@ -62,7 +62,7 @@ static void *__task_create(const char *name,int (*task_entry)(void *args),\
 
     if((stack_size > 0) && (NULL == stack))
     {
-        ret = task_spawn(name,prior, 0,stack_size + 0x1000,task_entry,(uintptr_t)args);
+        ret = task_spawn(name,prior, 0,stack_size ,task_entry,(uintptr_t)args);
     }
 
     return ret;

iot_link/shell/shell_main.c

@@ -86,7 +86,7 @@ this file implement the shell for the system.the following instruction you must
 //DEFINES FOR THE SHELL SERVER TASK STACK SIZE
 
 #ifndef  CONFIG_SHELL_TASKSTACK
-#define  CONFIG_SHELL_TASKSTACK   0x400
+#define  CONFIG_SHELL_TASKSTACK   0x800
 #endif
 
 

iot_link/stimer/stimer.c

@@ -44,9 +44,6 @@
 #include <stdio.h>
 
 
-#if CONFIG_STIMER_ENABLE
-
-
 #include <osal.h>
 #include <stimer.h>
 
@@ -55,7 +52,7 @@
 
 typedef struct timer_item
 {
-    const char         *name;        ///< verify the timer, will be used in the debug
+    char               *name;        ///< verify the timer, will be used in the debug
     uint32_t            cycle;       ///< timer cycle
     uint32_t            flag;        ///< timer flag
     fn_stimer_handler   handler;     ///< timer handler
@@ -269,18 +266,31 @@ int32_t stimer_init()
 stimer_t stimer_create(const char *name,fn_stimer_handler handler, void *arg,uint32_t cycle,uint32_t flag)
 {
     stimer_item_t *item;
+    int            mem_len;
+
+    mem_len = sizeof(stimer_item_t);
+
+    if(NULL != name)
+    {
+        mem_len += strlen(name) + 1;
+    }
 
-    item  = osal_malloc(sizeof(stimer_item_t));
+    item  = osal_malloc( mem_len);
     if(NULL == item)
     {
         return item;
     }
     memset(item,0,sizeof(stimer_item_t));
-    item->name = name;
     item->cycle = cycle;
     item->flag = flag;
     item->handler = handler;
     item->args = arg;
+    if(NULL != name)
+    {
+        item->name = (char *)item +sizeof(stimer_item_t);
+        strcpy(item->name, name);
+    }
+
 
     if(item->flag & cn_stimer_flag_start)
     {
@@ -386,6 +396,7 @@ int32_t stimer_ioctl(stimer_t timer,en_stimer_opt_t opt, void *arg)
 }
 
 
+#if CONFIG_SHELL_ENABLE
 #include <shell.h>
 static int32_t stimer_print(int32_t argc, const char *argv[])
 {
@@ -394,14 +405,15 @@ static int32_t stimer_print(int32_t argc, const char *argv[])
 
     if(true == osal_mutex_lock(s_stimer_cb.mutex))
     {
-        printf("%-8s %-8s %-8s %-8s %-5s %-5s %s\n\r",\
-                "TimerNo","Cycle","Handler","Arg","Start","Once","DeadTime");
+        printf("%-12s %-8s %-8s %-8s %-5s %-5s %s\n\r",\
+                "Timer-Name","Cycle","Handler","Arg","Start","Once","DeadTime");
 
         item = s_stimer_cb.lst;
         while(NULL != item)
         {
-            printf("%-8d %08x %08x %08x %-5s %-5s %x\n\r",\
-                    timer_number++,(unsigned int)item->cycle,(unsigned int)item->handler,(unsigned int)(uintptr_t)item->args,\
+            printf("%-12s %08x %08x %08x %-5s %-5s %x\n\r",\
+                    (NULL==item->name)?"UNKONW":item->name,\
+                    (unsigned int)item->cycle,(unsigned int)item->handler,(unsigned int)(uintptr_t)item->args,\
                     item->flag&cn_stimer_flag_start?"Yes":"No",item->flag&cn_stimer_flag_once?"Yes":"No",\
                     (unsigned int)item->dead_time);
             item = item->nxt;
@@ -415,5 +427,6 @@ static int32_t stimer_print(int32_t argc, const char *argv[])
 }
 OSSHELL_EXPORT_CMD(stimer_print,"stimer","stimer");
 
+
 #endif