Merge branch 'master' into dev

wangzhengquan

2020-10-13 32be9184bcab815ed1795889612a2c2c84a17334

 src/queue/shm_mm.c

@@ -10,4 +10,6 @@
   mem_pool_destroy();
}


int shm_alloc_key() {
   return mm_alloc_key();
}