[libthread] merge libatomic/liblock into libthread

README.cn.md

@@ -13,12 +13,12 @@
 
 |name|descript|name|descript|name|descript|
 |----|--------|----|--------|----|--------|
-|[libatomic](libatomic)|原子操作库|[libbase64](libbase64)|Base64/32 编解码|[libcmd](libcmd)|命令行库
+|[libbase64](libbase64)|Base64/32 编解码|[libcmd](libcmd)|命令行库
 |[libconfig](libconfig)|配置文件库|[libdebug](libdebug)|调试辅助库|[libdict](libdict)|哈希字典
 |[libfilewatcher](libfilewatcher)|文件监控|[libfile](libfile)|文件操作库|[libgevent](libgevent)|事件驱动
 |[libhal](libhal)|硬件抽象层|[libhash](libhash)|linux内核原生哈希库|[libipc](libipc)|进程间通信
 |[liblog](liblog)|日志库|[libmacro](libmacro)|通用宏定义|[libmp4parser](libmp4parser)|MP4解析库
-|[liblock](liblock)|锁操作|[libthread](libthread)|线程|[libp2p](libp2p)|p2p穿透传输
+||[libthread](libthread)|线程|[libp2p](libp2p)|p2p穿透传输
 |[libplugin](libplugin)|动态加载库|[librbtree](librbtree)|内核rbtree|[librpc](librpc)|远程过程调用库
 |[librtsp](librtsp)|RTSP协议|[libskt](libskt)|Socket封装|[libtime](libtime)|时间库
 |[libqueue](libqueue)|数据队列|[libringbuffer](libringbuffer)|循环缓冲|[libworkq](libworkq)|工作队列

README.md

@@ -13,12 +13,12 @@ This is a collection of basic libraries.
 
 |name|descript|name|descript|name|descript|
 |----|--------|----|--------|----|--------|
-|[libatomic](libatomic)|Atomic operation|[libbase64](libbase64)|Base64/32 encode/decode|[libcmd](libcmd)|Based on readline like bash
+|[libbase64](libbase64)|Base64/32 encode/decode|[libcmd](libcmd)|Based on readline like bash
 |[libconfig](libconfig)|Support ini/json|[libdebug](libdebug)|Help to trace crash like gdb|[libdict](libdict)|Hash key-value dictonary
 |[libfilewatcher](libfilewatcher)|Watch file/dir on event|[libfile](libfile)|File operations|[libgevent](libgevent) | Reactor event, like libevent
 |[libhal](libhal)|hardware Abstraction Layer|[libhash](libhash)|Hash key-value based on hlist|[libipc](libipc)|Support mqueue/netlink/shm
 |[liblog](liblog)|Support console/file/rsyslog|[libmacro](libmacro)|Basic Macro define|[libmp4parser](libmp4parser)|MP4 format parser
-|[liblock](liblock)|Lock/mutex/sem wrapper|[libthread](libthread)|Thread wrapper|[libp2p](libp2p)|p2p punch hole and transfer
+|[libthread](libthread)|Thread wrapper|[libp2p](libp2p)|p2p punch hole and transfer
 |[libplugin](libplugin)|Dynamic link plugin|[librbtree](librbtree)|linux kernel rbtree|[librpc](librpc)|Remote Procedure Call
 |[librtsp](librtsp)|Rtsp wrapper|[libskt](libskt)|Socket wrapper|[libtime](libtime)|Time wrapper
 |[libqueue](libqueue)|support memory hook|[libringbuffer](libringbuffer)|c ringbuffer|[libworkq](libworkq)|Work queue in userspace
@@ -28,7 +28,7 @@ This is a collection of basic libraries.
 |----|----|
 |data struct|libdict libhash libringbuffer libqueue librbtree libsort libvector libmacro
 |network|librtsp libskt libp2p librpc libipc
-|async|libgevent libworkq libthread liblock libatomic
+|async|libgevent libworkq libthread
 |I/O parser|libbase64 libconfig libconfig++ liblog libfile libfilewatcher libstrex libcmd
 |multi-media|libuvc libjpeg-ex libmp4parser
 |misc|libdebug libhal libplugin libtime

build.sh

@@ -17,8 +17,8 @@ esac
 PLATFORM="[linux|pi|android|ios]"
 
 #basic libraries
-BASIC_LIBS="libmacro libatomic libtime liblog libgevent libworkq libdict libsort \
-	    librbtree libringbuffer liblock libthread libconfig libvector libbase64 \
+BASIC_LIBS="libmacro libtime liblog libgevent libworkq libdict libsort \
+	    librbtree libringbuffer libthread libconfig libvector libbase64 \
             libdebug libfile libuvc libmp4parser libqueue "
 FRAMEWORK_LIBS="libipc"
 NETWORK_LIBS="libskt librpc libp2p librtsp"