Merge branch 'master' into dev

wangzhengquan

2021-02-20 8bfe9f711612efde96a0d7b7aa3ba7178ab51640

 src/socket/shm_socket.cpp

@@ -118,10 +118,8 @@
  //   sockt->queue = NULL;
  // }

  rv =  pthread_mutex_destroy(&(sockt->mutex) );
  if(rv != 0) {
    err_exit(rv, "shm_socket_close");
  }
  pthread_mutex_destroy(&(sockt->mutex) );
   

  free(sockt);